Fixed Windows service life-cycle. (#1153)

This fix fixes two issues:
https://github.com/yggdrasil-network/yggdrasil-go/issues/993 &
https://github.com/yggdrasil-network/yggdrasil-go/issues/1098
This commit is contained in:
Revertron 2024-07-25 14:55:14 +02:00 committed by GitHub
parent 5ea16e63a1
commit 4fbdeb4e3f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -53,13 +53,13 @@ func main() {
getpkey := flag.Bool("publickey", false, "use in combination with either -useconf or -useconffile, outputs your public key") getpkey := flag.Bool("publickey", false, "use in combination with either -useconf or -useconffile, outputs your public key")
loglevel := flag.String("loglevel", "info", "loglevel to enable") loglevel := flag.String("loglevel", "info", "loglevel to enable")
flag.Parse() flag.Parse()
done := make(chan struct{})
defer close(done)
// Catch interrupts from the operating system to exit gracefully. // Catch interrupts from the operating system to exit gracefully.
ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM) ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
// Capture the service being stopped on Windows.
minwinsvc.SetOnExit(cancel)
// Create a new logger that logs output to stdout. // Create a new logger that logs output to stdout.
var logger *log.Logger var logger *log.Logger
switch *logto { switch *logto {
@ -271,6 +271,14 @@ func main() {
n.tun.SetupAdminHandlers(n.admin) n.tun.SetupAdminHandlers(n.admin)
} }
} }
//Windows service shutdown
minwinsvc.SetOnExit(func() {
logger.Infof("Shutting down service ...")
cancel()
// Wait for all parts to shutdown properly
<-done
})
// Block until we are told to shut down. // Block until we are told to shut down.
<-ctx.Done() <-ctx.Done()