version 12.1.5

Former-commit-id: cda69f08955cb0d594e98bf26197ee573cbba4b2

core/host/interrupt.go

@@ -64,13 +64,11 @@ func (i *interruptListener) notifyAndFire() {
 		os.Interrupt,
 		syscall.SIGINT, // register that too, it should be ok
 		// os.Kill  is equivalent with the syscall.SIGKILL
-		os.Kill,
-		syscall.SIGKILL, // register that too, it should be ok
+		// os.Kill,
+		// syscall.SIGKILL, // register that too, it should be ok
 		// kill -SIGTERM XXXX
 		syscall.SIGTERM,
 	)
-	select {
-	case <-ch:
-		i.FireNow()
-	}
+	<-ch
+	i.FireNow()
 }

core/host/supervisor.go

@@ -194,12 +194,8 @@ func (su *Supervisor) supervise(blockFunc func() error) error {
 	su.notifyErr(err)
 
 	if su.isWaiting() {
-	blockStatement:
-		for {
-			select {
-			case <-su.unblockChan:
-				break blockStatement
-			}
+		for range su.unblockChan {
+			break
 		}
 	}
 

core/host/supervisor_task_example_test.go

@@ -28,7 +28,9 @@ func ExampleSupervisor_RegisterOnError() {
 
 	go su.ListenAndServe()
 	time.Sleep(1 * time.Second)
-	su.Shutdown(context.TODO())
+	if err := su.Shutdown(context.TODO()); err != nil {
+		panic(err)
+	}
 	time.Sleep(1 * time.Second)
 
 	// Output:
@@ -49,37 +51,30 @@ func (m myTestTask) OnServe(host TaskHost) {
 	ticker := time.NewTicker(m.restartEvery)
 	defer ticker.Stop()
 	rans := 0
-	for {
-		select {
-		case _, ok := <-ticker.C:
-			{
-				if !ok {
-					m.logger.Println("ticker issue, closed channel, exiting from this task...")
-					return
-				}
-				exitAfterXRestarts := m.maxRestarts
-				if rans == exitAfterXRestarts {
-					m.logger.Println("exit")
-					ctx, cancel := context.WithTimeout(context.TODO(), 5*time.Second)
-					defer cancel()
-					host.Supervisor.Shutdown(ctx) // total shutdown
-					host.Supervisor.RestoreFlow() // free to exit (if shutdown)
-					return
-				}
-
-				rans++
-
-				m.logger.Println(fmt.Sprintf("closed %d times", rans))
-				host.Shutdown(context.TODO())
-
-				startDelay := 2 * time.Second
-				time.AfterFunc(startDelay, func() {
-					m.logger.Println("restart")
-					host.Serve() // restart
-				})
-
-			}
+	for range ticker.C {
+		exitAfterXRestarts := m.maxRestarts
+		if rans == exitAfterXRestarts {
+			m.logger.Println("exit")
+			ctx, cancel := context.WithTimeout(context.TODO(), 5*time.Second)
+			defer cancel()
+			_ = host.Supervisor.Shutdown(ctx) // total shutdown
+			host.Supervisor.RestoreFlow()     // free to exit (if shutdown)
+			return
 		}
+
+		rans++
+
+		m.logger.Println(fmt.Sprintf("closed %d times", rans))
+		host.Shutdown(context.TODO())
+
+		startDelay := 2 * time.Second
+		time.AfterFunc(startDelay, func() {
+			m.logger.Println("restart")
+			if err := host.Serve(); err != nil { // restart
+				panic(err)
+			}
+		})
+
 	}
 }
 

core/host/supervisor_test.go

@@ -61,7 +61,10 @@ func testSupervisor(t *testing.T, creator func(*http.Server, []func(TaskHost)) *
 
 	mux := http.NewServeMux()
 	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte(expectedBody))
+		_, err := w.Write([]byte(expectedBody))
+		if err != nil {
+			t.Fatal(err)
+		}
 	})
 
 	// host (server wrapper and adapter) construction

core/host/task.go

@@ -27,7 +27,7 @@ func WriteStartupLogOnServe(w io.Writer) func(TaskHost) {
 		if runtime.GOOS == "darwin" {
 			interruptkey = "CMD"
 		}
-		w.Write([]byte(fmt.Sprintf("Now listening on: %s\nApplication started. Press %s+C to shut down.\n",
+		_, _ = w.Write([]byte(fmt.Sprintf("Now listening on: %s\nApplication started. Press %s+C to shut down.\n",
 			listeningURI, interruptkey)))
 	}
 }