hscontrol/app.go

@@ -555,7 +555,7 @@ func nodesChangedHook(
 }
 
 // Serve launches the HTTP and gRPC server service Headscale and the API.
-func (h *Headscale) Serve(ctx context.Context) error {
+func (h *Headscale) Serve() error {
 	capver.CanOldCodeBeCleanedUp()
 
 	if profilingEnabled {
@@ -631,7 +631,7 @@ func (h *Headscale) Serve(ctx context.Context) error {
 
 	// Start all scheduled tasks, e.g. expiring nodes, derp updates and
 	// records updates
-	scheduleCtx, scheduleCancel := context.WithCancel(ctx)
+	scheduleCtx, scheduleCancel := context.WithCancel(context.Background())
 	defer scheduleCancel()
 	go h.scheduledTasks(scheduleCtx)
 
@@ -644,6 +644,7 @@ func (h *Headscale) Serve(ctx context.Context) error {
 	// Prepare group for running listeners
 	errorGroup := new(errgroup.Group)
 
+	ctx := context.Background()
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
@@ -836,8 +837,7 @@ func (h *Headscale) Serve(ctx context.Context) error {
 	sigFunc := func(c chan os.Signal) {
 		// Wait for a SIGINT or SIGKILL:
 		for {
-			select {
+			sig := <-c
-			case sig := <-c:
 			switch sig {
 			case syscall.SIGHUP:
 				log.Info().
@@ -942,19 +942,8 @@ func (h *Headscale) Serve(ctx context.Context) error {
 
 				return
 			}
-			case <-ctx.Done():
-				// send signal to kill
-				// could be done a lot better
-				select {
-				case sigc <- os.Kill:
-					fmt.Println("sent kill message")
-				default:
-					fmt.Println("no kill message sent")
 		}
 	}
-		}
-
-	}
 	errorGroup.Go(func() error {
 		sigFunc(sigc)