M backend.go → backend.go

@@ -23,7 +23,10 @@ "net/http"
 	"net/rpc"
 	"os"
 	"os/exec"
+	"os/signal"
 	"strings"
+	"sync"
+	"syscall"
 
 	"humungus.tedunangst.com/r/webs/gate"
 	"humungus.tedunangst.com/r/webs/image"
@@ -112,6 +115,7 @@
 func backendServer() {
 	dlog.Printf("backend server running")
 	go orphancheck()
+	signal.Ignore(syscall.SIGINT)
 	shrinker := new(Shrinker)
 	srv := rpc.NewServer()
 	err := srv.Register(shrinker)
@@ -152,9 +156,23 @@ err = proc.Start()
 	if err != nil {
 		elog.Panicf("can't exec backend: %s", err)
 	}
+	workinprogress++
+	var mtx sync.Mutex
 	go func() {
-		proc.Wait()
-		elog.Printf("lost the backend: %s", err)
+		<-endoftheworld
+		mtx.Lock()
+		defer mtx.Unlock()
 		w.Close()
+		w = nil
+		readyalready <- true
+	}()
+	go func() {
+		proc.Wait()
+		mtx.Lock()
+		defer mtx.Unlock()
+		if w != nil {
+			elog.Printf("lost the backend: %s", err)
+			w.Close()
+		}
 	}()
 }

M web.go → web.go

@@ -2556,7 +2556,7 @@ var workinprogress = 0
 
 func enditall() {
 	sig := make(chan os.Signal)
-	signal.Notify(sig, os.Interrupt, syscall.SIGTERM, syscall.SIGQUIT)
+	signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
 	<-sig
 	ilog.Printf("stopping...")
 	for i := 0; i < workinprogress; i++ {