diff --git a/daemon/2serverUNIXGeneric.go b/daemon/2serverUNIXGeneric.go index a94bbfa..7324d5b 100644 --- a/daemon/2serverUNIXGeneric.go +++ b/daemon/2serverUNIXGeneric.go @@ -38,9 +38,9 @@ func Start(passphrase []byte) { defer listener.Close() log.Printf("RPC daemon listening on unix://%s", socketPath) - // capture sigterms to ensure listener is closed + // capture termination signals to ensure listener is closed sigChan := make(chan os.Signal, 1) - signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM) + signal.Notify(sigChan, os.Interrupt, syscall.SIGINT, syscall.SIGTERM) go func() { <-sigChan listener.Close() diff --git a/daemon/2serverWindows.go b/daemon/2serverWindows.go index 13223bb..2adbd88 100644 --- a/daemon/2serverWindows.go +++ b/daemon/2serverWindows.go @@ -52,9 +52,9 @@ func Start(passphrase []byte) { defer listener.Close() log.Printf("RPC daemon listening on %s", socketPath) - // capture sigterms to ensure listener is closed + // capture termination signals to ensure listener is closed sigChan := make(chan os.Signal, 1) - signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM) + signal.Notify(sigChan, os.Interrupt) // create inactivity timer timer := time.NewTimer(time.Duration(Timeout) * time.Second) killTimer := make(chan struct{}) diff --git a/go.mod b/go.mod index 51e2456..c4fe945 100644 --- a/go.mod +++ b/go.mod @@ -1,17 +1,17 @@ module github.com/rwinkhart/rcw -go 1.25.6 +go 1.25.7 require ( github.com/Microsoft/go-winio v0.6.2 - github.com/rwinkhart/go-boilerplate v0.2.2 - github.com/rwinkhart/peercred-mini v0.1.2 - golang.org/x/crypto v0.47.0 - golang.org/x/sys v0.40.0 + github.com/rwinkhart/go-boilerplate v0.2.3-0.20260210031547-48e6abea8b2f + github.com/rwinkhart/peercred-mini v0.1.3 + golang.org/x/crypto v0.48.0 + golang.org/x/sys v0.41.0 ) -require golang.org/x/term v0.39.0 // indirect +require golang.org/x/term v0.40.0 // indirect -replace golang.org/x/sys => github.com/rwinkhart/sys v0.40.0 +replace golang.org/x/sys => github.com/rwinkhart/sys v0.41.0 -replace github.com/Microsoft/go-winio => github.com/rwinkhart/go-winio v0.1.0 +replace github.com/Microsoft/go-winio => github.com/rwinkhart/go-winio v0.1.1 diff --git a/go.sum b/go.sum index 9d01c23..3485463 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,12 @@ -github.com/rwinkhart/go-boilerplate v0.2.2 h1:SVHTAQU+HWFivtUnDBcfrgClJV5ZmHyFS7/uERh7NKU= -github.com/rwinkhart/go-boilerplate v0.2.2/go.mod h1:/NVRKGslU20E5xU5YOgXzWxA6aa94BMtv5MtHRTb5Ek= -github.com/rwinkhart/go-winio v0.1.0 h1:b72agLW+dETGmhR3VbcbwnStfgKfc5AfgJOXBJDkaHg= -github.com/rwinkhart/go-winio v0.1.0/go.mod h1:ZWa7ssZJT30CCDGJ7fk/2SBTq9BIQrrVjrcss0UW2s0= -github.com/rwinkhart/peercred-mini v0.1.2 h1:4cGWDbv0whvLeVvbUdx84V/9p+2fS+DEXgrA1KxlRFo= -github.com/rwinkhart/peercred-mini v0.1.2/go.mod h1:LLHG7YshHEpbpJJP+Il9nx2dnGj5O3VGE32rWmflj0c= -github.com/rwinkhart/sys v0.40.0 h1:ZPBbXb+27vLL518sZhhNV89jXK1KbCnFGmYJ2juOQ/c= -github.com/rwinkhart/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8= -golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A= -golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY= -golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww= +github.com/rwinkhart/go-boilerplate v0.2.3-0.20260210031547-48e6abea8b2f h1:QloiAudLU8WAVs+loMU4ZiSd8ve0eiSkGtFhQUibhTw= +github.com/rwinkhart/go-boilerplate v0.2.3-0.20260210031547-48e6abea8b2f/go.mod h1:ES13A2r9fnCVfyezwMBgY/RgA4pOIudOUXz3Jk/ikes= +github.com/rwinkhart/go-winio v0.1.1 h1:kAJKiqneR7cUR01Wn5/doAAV4kOGTEGPug4oinXc5N4= +github.com/rwinkhart/go-winio v0.1.1/go.mod h1:ZWa7ssZJT30CCDGJ7fk/2SBTq9BIQrrVjrcss0UW2s0= +github.com/rwinkhart/peercred-mini v0.1.3 h1:Pbyk/f4oXVtX38uuZAyxZZ8ZzRImL6WWgCr0pSktCKU= +github.com/rwinkhart/peercred-mini v0.1.3/go.mod h1:E8eApo/izzmq4nGGR+kpJ0ZLAXjofnVRMGCeVMPQ/Ik= +github.com/rwinkhart/sys v0.41.0 h1:pHB6HphVC132UXYZ6yeOk62abqgl+pyl5ZZnsk4iUKg= +github.com/rwinkhart/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= +golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= +golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= +golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=