Changeset 605 in code for trunk

Timestamp:

Oct 5, 2021, 5:13:53 PM (4 years ago)

Author:

contact

Message:

Add "server status" command

Right now, it prints the number of active users and number of
downstream connections.

Location:

trunk

Files:

• doc/soju.1.scd (modified) (1 diff)
• server.go (modified) (4 diffs)
• service.go (modified) (2 diffs)

trunk/doc/soju.1.scd

@@ -321 +321 @@
         Delete a soju user. Only admins can delete accounts.
 
+*server status*
+        Show some bouncer statistics. Only admins can query this information.
+
 # AUTHORS
 

trunk/server.go

@@ -56 +56 @@
         Identd         *Identd // can be nil
 
-        db     Database
-        stopWG sync.WaitGroup
+        db        Database
+        stopWG    sync.WaitGroup
+        connCount int64 // atomic
 
         lock      sync.Mutex
@@ -166 +167 @@
 
 func (s *Server) handle(ic ircConn) {
+        atomic.AddInt64(&s.connCount, 1)
         id := atomic.AddUint64(&lastDownstreamID, 1)
         dc := newDownstreamConn(s, ic, id)
@@ -178 +180 @@
         }
         dc.Close()
+        atomic.AddInt64(&s.connCount, -1)
 }
 
@@ -250 +253 @@
         return params
 }
+
+type ServerStats struct {
+        Users       int
+        Downstreams int64
+}
+
+func (s *Server) Stats() *ServerStats {
+        var stats ServerStats
+        s.lock.Lock()
+        stats.Users = len(s.users)
+        s.lock.Unlock()
+        stats.Downstreams = atomic.LoadInt64(&s.connCount)
+        return &stats
+}

trunk/service.go

@@ -293 +293 @@
                         },
                 },
+                "server": {
+                        children: serviceCommandSet{
+                                "status": {
+                                        desc:   "show server statistics",
+                                        handle: handleServiceServerStatus,
+                                        admin:  true,
+                                },
+                        },
+                        admin: true,
+                },
         }
 }
@@ -1008 +1018 @@
         return nil
 }
+
+func handleServiceServerStatus(dc *downstreamConn, params []string) error {
+        stats := dc.user.srv.Stats()
+        sendServicePRIVMSG(dc, fmt.Sprintf("%v users, %v downstreams", stats.Users, stats.Downstreams))
+        return nil
+}