Changeset 607 in code for trunk

Timestamp:

Oct 5, 2021, 5:31:06 PM (4 years ago)

Author:

contact

Message:

Add DB stats

Location:

trunk

Files:

• db.go (modified) (2 diffs)
• db_sqlite.go (modified) (1 diff)
• service.go (modified) (1 diff)

trunk/db.go

@@ -10 +10 @@
 type Database interface {
         Close() error
+        Stats() (*DatabaseStats, error)
 
         ListUsers() ([]User, error)
@@ -25 +26 @@
         ListDeliveryReceipts(networkID int64) ([]DeliveryReceipt, error)
         StoreClientDeliveryReceipts(networkID int64, client string, receipts []DeliveryReceipt) error
+}
+
+type DatabaseStats struct {
+        Users    int64
+        Networks int64
+        Channels int64
 }
 

trunk/db_sqlite.go

@@ -206 +206 @@
 }
 
+func (db *SqliteDB) Stats() (*DatabaseStats, error) {
+        db.lock.RLock()
+        defer db.lock.RUnlock()
+
+        var stats DatabaseStats
+        row := db.db.QueryRow(`SELECT
+                (SELECT COUNT(*) FROM User) AS users,
+                (SELECT COUNT(*) FROM Network) AS networks,
+                (SELECT COUNT(*) FROM Channel) AS channels`)
+        if err := row.Scan(&stats.Users, &stats.Networks, &stats.Channels); err != nil {
+                return nil, err
+        }
+
+        return &stats, nil
+}
+
 func toNullString(s string) sql.NullString {
         return sql.NullString{

trunk/service.go

@@ -1027 +1027 @@
 
 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
-}
+        dbStats, err := dc.user.srv.db.Stats()
+        if err != nil {
+                return err
+        }
+        serverStats := dc.user.srv.Stats()
+        sendServicePRIVMSG(dc, fmt.Sprintf("%v/%v users, %v downstreams, %v networks, %v channels", serverStats.Users, dbStats.Users, serverStats.Downstreams, dbStats.Networks, dbStats.Channels))
+        return nil
+}