Changeset 691 in code for trunk/server.go

Timestamp:

Nov 15, 2021, 11:38:04 PM (4 years ago)

Author:

contact

Message:

Allow most config options to be reloaded

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

File:

• trunk/server.go (modified) (6 diffs)

trunk/server.go

@@ -54 +54 @@
 }
 
-type Server struct {
+type Config struct {
         Hostname        string
         Title           string
-        Logger          Logger
         LogPath         string
         Debug           bool
@@ -63 +62 @@
         AcceptProxyIPs  config.IPSet
         MaxUserNetworks int
-        Identd          *Identd // can be nil
-
+        MOTD            string
+}
+
+type Server struct {
+        Logger Logger
+        Identd *Identd // can be nil
+
+        config    atomic.Value // *Config
         db        Database
         stopWG    sync.WaitGroup
@@ -72 +77 @@
         listeners map[net.Listener]struct{}
         users     map[string]*user
-
-        motd atomic.Value // string
 }
 
 func NewServer(db Database) *Server {
         srv := &Server{
-                Logger:          log.New(log.Writer(), "", log.LstdFlags),
-                MaxUserNetworks: -1,
-                db:              db,
-                listeners:       make(map[net.Listener]struct{}),
-                users:           make(map[string]*user),
-        }
-        srv.motd.Store("")
+                Logger:    log.New(log.Writer(), "", log.LstdFlags),
+                db:        db,
+                listeners: make(map[net.Listener]struct{}),
+                users:     make(map[string]*user),
+        }
+        srv.config.Store(&Config{Hostname: "localhost", MaxUserNetworks: -1})
         return srv
 }
 
 func (s *Server) prefix() *irc.Prefix {
-        return &irc.Prefix{Name: s.Hostname}
+        return &irc.Prefix{Name: s.Config().Hostname}
+}
+
+func (s *Server) Config() *Config {
+        return s.config.Load().(*Config)
+}
+
+func (s *Server) SetConfig(cfg *Config) {
+        s.config.Store(cfg)
 }
 
@@ -240 +250 @@
         conn, err := websocket.Accept(w, req, &websocket.AcceptOptions{
                 Subprotocols:   []string{"text.ircv3.net"}, // non-compliant, fight me
-                OriginPatterns: s.HTTPOrigins,
+                OriginPatterns: s.Config().HTTPOrigins,
         })
         if err != nil {
@@ -250 +260 @@
         if host, _, err := net.SplitHostPort(req.RemoteAddr); err == nil {
                 if ip := net.ParseIP(host); ip != nil {
-                        isProxy = s.AcceptProxyIPs.Contains(ip)
+                        isProxy = s.Config().AcceptProxyIPs.Contains(ip)
                 }
         }
@@ -294 +304 @@
         return &stats
 }
-
-func (s *Server) SetMOTD(motd string) {
-        s.motd.Store(motd)
-}
-
-func (s *Server) MOTD() string {
-        return s.motd.Load().(string)
-}