Changeset 636 in code for trunk/cmd/soju

Timestamp:

Oct 13, 2021, 8:58:34 AM (4 years ago)

Author:

contact

Message:

Add bouncer MOTD

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

File:

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

trunk/cmd/soju/main.go

@@ -6 +6 @@
         "flag"
         "fmt"
+        "io/ioutil"
         "log"
         "net"
@@ -37 +38 @@
 }
 
+func loadMOTD(srv *soju.Server, filename string) error {
+        if filename == "" {
+                return nil
+        }
+
+        b, err := ioutil.ReadFile(filename)
+        if err != nil {
+                return err
+        }
+        srv.SetMOTD(strings.TrimSpace(string(b)))
+        return nil
+}
+
 func main() {
         var listen []string
@@ -92 +106 @@
         srv.Debug = debug
 
+        if err := loadMOTD(srv, cfg.MOTDPath); err != nil {
+                log.Fatalf("failed to load MOTD: %v", err)
+        }
+
         for _, listen := range cfg.Listen {
                 listenURI := listen
@@ -225 +243 @@
                 switch sig {
                 case syscall.SIGHUP:
+                        log.Print("reloading TLS certificate and MOTD")
                         if cfg.TLS != nil {
-                                log.Print("reloading TLS certificate")
                                 cert, err := tls.LoadX509KeyPair(cfg.TLS.CertPath, cfg.TLS.KeyPath)
                                 if err != nil {
@@ -233 +251 @@
                                 }
                                 tlsCert.Store(&cert)
+                        }
+                        if err := loadMOTD(srv, cfg.MOTDPath); err != nil {
+                                log.Printf("failed to reload MOTD: %v", err)
                         }
                 case syscall.SIGINT, syscall.SIGTERM: