hub: add SIGINT handling to sfive-hub

1 files changed, 22 insertions, 3 deletions

diff --git a/src/hub/src/spreadspace.org/sfive-hub/s5hub.go b/src/hub/src/spreadspace.org/sfive-hub/s5hub.go
index bb5e80f..c00cb3c 100644
--- a/src/hub/src/spreadspace.org/sfive-hub/s5hub.go
+++ b/src/hub/src/spreadspace.org/sfive-hub/s5hub.go
@@ -3,15 +3,17 @@ package main
 import (
 	"fmt"
 	"log"
+	"os"
+	"os/signal"
 	"spreadspace.org/sfive"
 	"sync"
 )
 
 func main() {
-	fmt.Printf("s5: Hello, world.\n")
+	fmt.Printf("s5hub: Hello, world.\n")
 	server, err := sfive.NewServer("/tmp/sfive.sqlite")
 	if err != nil {
-		log.Fatalf("failed to initialize S5: %v", err)
+		log.Fatalf("s5hub: failed to initialize: %v", err)
 	}
 	defer server.Close()
 
@@ -21,13 +23,30 @@ func main() {
 	go func() {
 		defer wg.Done()
 		server.ServePipe("/run/sfive/pipe")
+		log.Println("s5hub: pipe finished")
 	}()
 
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
 		server.ServeWeb()
+		log.Println("s5hub: web finished")
 	}()
 
-	wg.Wait()
+	alldone := make(chan bool)
+	go func() {
+		defer func() { alldone <- true }()
+		wg.Wait()
+	}()
+
+	c := make(chan os.Signal, 1)
+	signal.Notify(c, os.Interrupt)
+
+	select {
+	case <-c:
+		log.Println("s5hub: received interrupt, shutdown")
+		return
+	case <-alldone:
+		return
+	}
 }