Changeset 449 in code for trunk/cmd/soju/main.go

Timestamp:

Feb 9, 2021, 4:34:46 PM (4 years ago)

Author:

contact

Message:

Add support for graceful shutdown

Closes: ​https://todo.sr.ht/~emersion/soju/45

File:

• trunk/cmd/soju/main.go (modified) (7 diffs)

trunk/cmd/soju/main.go

@@ -8 +8 @@
         "net/http"
         "net/url"
+        "os"
+        "os/signal"
         "strings"
+        "syscall"
 
         "github.com/pires/go-proxyproto"
@@ -90 +93 @@
                         ln = proxyProtoListener(ln, srv)
                         go func() {
-                                log.Fatal(srv.Serve(ln))
+                                if err := srv.Serve(ln); err != nil {
+                                        log.Printf("serving %q: %v", listen, err)
+                                }
                         }()
                 case "irc+insecure":
@@ -103 +108 @@
                         ln = proxyProtoListener(ln, srv)
                         go func() {
-                                log.Fatal(srv.Serve(ln))
+                                if err := srv.Serve(ln); err != nil {
+                                        log.Printf("serving %q: %v", listen, err)
+                                }
                         }()
                 case "wss":
@@ -116 +123 @@
                         }
                         go func() {
-                                log.Fatal(httpSrv.ListenAndServeTLS("", ""))
+                                if err := httpSrv.ListenAndServeTLS("", ""); err != nil {
+                                        log.Fatalf("serving %q: %v", listen, err)
+                                }
                         }()
                 case "ws+insecure":
@@ -128 +137 @@
                         }
                         go func() {
-                                log.Fatal(httpSrv.ListenAndServe())
+                                if err := httpSrv.ListenAndServe(); err != nil {
+                                        log.Fatalf("serving %q: %v", listen, err)
+                                }
                         }()
                 case "ident":
@@ -145 +156 @@
                         ln = proxyProtoListener(ln, srv)
                         go func() {
-                                log.Fatal(srv.Identd.Serve(ln))
+                                if err := srv.Identd.Serve(ln); err != nil {
+                                        log.Printf("serving %q: %v", listen, err)
+                                }
                         }()
                 default:
@@ -153 +166 @@
                 log.Printf("server listening on %q", listen)
         }
-        log.Fatal(srv.Run())
+
+        sigCh := make(chan os.Signal, 1)
+        signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
+
+        if err := srv.Start(); err != nil {
+                log.Fatal(err)
+        }
+
+        <-sigCh
+        log.Print("shutting down server")
+        srv.Shutdown()
 }