feat: implemented a new parent lifecycle to support shutdown when parent application shuts down

Author: f7f376a1fcd0d0e11a10ed1b6577c9

services/server/lifecycle/parent.go

@@ -0,0 +1,48 @@
+package lifecycle
+
+import (
+	"io"
+	"os"
+	"os/signal"
+	"sync"
+)
+
+const ParentStdinWatchEnv = "HORNETS_PARENT_STDIN_WATCH"
+
+// StopChannel closes when an OS shutdown signal arrives or, when explicitly
+// enabled, when the supervising parent's stdin pipe reaches EOF. Services and
+// standalone invocations retain their existing signal-only lifecycle.
+func StopChannel(parent io.Reader, watchParent bool, shutdownSignals ...os.Signal) <-chan struct{} {
+	stop := make(chan struct{})
+	var once sync.Once
+	requestStop := func() {
+		once.Do(func() { close(stop) })
+	}
+
+	signals := make(chan os.Signal, 1)
+	signal.Notify(signals, shutdownSignals...)
+	go func() {
+		select {
+		case <-signals:
+			requestStop()
+		case <-stop:
+		}
+		signal.Stop(signals)
+	}()
+
+	if watchParent {
+		go func() {
+			_, _ = io.Copy(io.Discard, parent)
+			requestStop()
+		}()
+	}
+
+	return stop
+}
+
+// WatchParentStdin reports whether this console process was launched under the
+// Nosis session supervisor. It is deliberately opt-in so an ordinary closed
+// terminal stdin never stops a service or standalone relay.
+func WatchParentStdin() bool {
+	return os.Getenv(ParentStdinWatchEnv) == "1"
+}

services/server/lifecycle/parent_test.go

@@ -0,0 +1,45 @@
+package lifecycle
+
+import (
+	"os"
+	"testing"
+	"time"
+)
+
+func TestStopChannelClosesWhenParentPipeCloses(t *testing.T) {
+	reader, writer, err := os.Pipe()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer reader.Close()
+
+	stop := StopChannel(reader, true, os.Interrupt)
+	if err := writer.Close(); err != nil {
+		t.Fatal(err)
+	}
+
+	select {
+	case <-stop:
+	case <-time.After(time.Second):
+		t.Fatal("parent pipe EOF did not close stop channel")
+	}
+}
+
+func TestStopChannelIgnoresClosedParentWhenWatchDisabled(t *testing.T) {
+	reader, writer, err := os.Pipe()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer reader.Close()
+
+	stop := StopChannel(reader, false, os.Interrupt)
+	if err := writer.Close(); err != nil {
+		t.Fatal(err)
+	}
+
+	select {
+	case <-stop:
+		t.Fatal("closed parent pipe stopped an unsupervised process")
+	case <-time.After(50 * time.Millisecond):
+	}
+}

services/server/port/main.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"flag"
 	"os"
-	"os/signal"
 	"syscall"
 
 	"github.com/HORNET-Storage/hornet-storage/lib/logging"
 	"github.com/HORNET-Storage/hornet-storage/services/server/core"
+	"github.com/HORNET-Storage/hornet-storage/services/server/lifecycle"
 )
 
 var (
@@ -30,15 +30,12 @@ func init() {
 }
 
 func main() {
-	// Convert OS kill signals into the core stop channel
-	sigs := make(chan os.Signal, 1)
-	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
-
-	stop := make(chan struct{})
-	go func() {
-		<-sigs
-		close(stop)
-	}()
+	stop := lifecycle.StopChannel(
+		os.Stdin,
+		lifecycle.WatchParentStdin(),
+		syscall.SIGINT,
+		syscall.SIGTERM,
+	)
 
 	if err := core.Run(context.Background(), core.Options{
 		CompactDB:      *compactDB,

services/server/windows/main.go

@@ -7,7 +7,6 @@ import (
 	"flag"
 	"fmt"
 	"os"
-	"os/signal"
 	"path/filepath"
 	"strings"
 	"syscall"
@@ -16,6 +15,7 @@ import (
 
 	"github.com/HORNET-Storage/hornet-storage/lib/logging"
 	"github.com/HORNET-Storage/hornet-storage/services/server/core"
+	"github.com/HORNET-Storage/hornet-storage/services/server/lifecycle"
 )
 
 // serviceName is the Windows service identity shared by the installer
@@ -77,15 +77,12 @@ func runConsole() {
 	// Initialize config and logging before entering the shared run lifecycle
 	core.Initialize()
 
-	// Convert OS kill signals into the core stop channel
-	sigs := make(chan os.Signal, 1)
-	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
-
-	stop := make(chan struct{})
-	go func() {
-		<-sigs
-		close(stop)
-	}()
+	stop := lifecycle.StopChannel(
+		os.Stdin,
+		lifecycle.WatchParentStdin(),
+		syscall.SIGINT,
+		syscall.SIGTERM,
+	)
 
 	if err := core.Run(context.Background(), options(stop)); err != nil {
 		logging.Fatalf("Relay exited with error: %v", err)