Update to new logging version

Sources/App/Management/SQLiteDatabase.swift

@@ -51,17 +51,15 @@ final class SQLiteDatabase {
 
     private let registeredPlayerCountMetric: Metric<Int>
 
-    init(database: Database, mail: Configuration.EMail?) {
-        self.registeredPlayerCountMetric = Metric(
+    init(database: Database, mail: Configuration.EMail?) async throws {
+        self.registeredPlayerCountMetric = try await Metric(
             "schafkopf.players",
             name: "Number of users",
             description: "The total number of user accounts")
-        self.tables = TableManagement(database: database)
+        self.tables = try await TableManagement(database: database)
         self.mail = mail?.mailConfig
 
-        Task {
-            await updateRegisteredPlayerCount(from: database)
-        }
+        await updateRegisteredPlayerCount(from: database)
     }
 
     func registerPlayer(named name: PlayerName, hash: PasswordHash, email: String?, in database: Database) async throws -> SessionToken {
@@ -92,7 +90,7 @@ final class SQLiteDatabase {
     func updateRegisteredPlayerCount(from database: Database) async {
         do {
             let count = try await User.query(on: database).count()
-            registeredPlayerCountMetric.update(count)
+            try? await registeredPlayerCountMetric.update(count)
         } catch {
             log("Failed to update player count metric: \(error)")
         }

Sources/App/Management/TableManagement.swift

@@ -27,26 +27,25 @@ final class TableManagement {
      Load the tables from a file in the storage folder
      - Throws: Errors when the file could not be read
      */
-    init(database: Database) {
-        self.tableCountMetric = .init(
+    init(database: Database) async throws {
+        self.tableCountMetric = try await .init(
             "schafkopf.tables",
             name: "Open tables",
             description: "The number of currently available tables")
-        self.playingPlayerCountMetric = .init(
+        self.playingPlayerCountMetric = try await .init(
             "schafkopf.playing",
             name: "Sitting players",
             description: "The number of players currently sitting at a table")
-        self.connectedPlayerCountMetric = .init(
+        self.connectedPlayerCountMetric = try await .init(
             "schafkopf.connected",
             name: "Connected players",
             description: "The number of players with a websocket connection to the server")
 
-        Task {
-            do {
-                try await loadTables(from: database)
-            } catch {
-                log("Failed to load tables: \(error)")
-            }
+
+        do {
+            try await loadTables(from: database)
+        } catch {
+            log("Failed to load tables: \(error)")
         }
     }
 
@@ -60,23 +59,23 @@ final class TableManagement {
             self.tables[id] = WaitingTable(id: id, name: table.name, isPublic: table.isPublic, players: table.players)
         }
         log("\(tables.count) tables loaded")
-        logTableCount()
-        logPlayingPlayerCount()
-        logConnectedPlayerCount()
+        await logTableCount()
+        await logPlayingPlayerCount()
+        await logConnectedPlayerCount()
     }
 
-    private func logTableCount() {
-        tableCountMetric.update(tables.count)
+    private func logTableCount() async {
+        try? await tableCountMetric.update(tables.count)
     }
 
-    private func logPlayingPlayerCount() {
+    private func logPlayingPlayerCount() async {
         let count = tables.values.sum { $0.playerCount }
-        playingPlayerCountMetric.update(count)
+        try? await playingPlayerCountMetric.update(count)
     }
 
-    private func logConnectedPlayerCount() {
+    private func logConnectedPlayerCount() async {
         let count = tables.values.sum { $0.numberOfConnectedPlayers }
-        connectedPlayerCountMetric.update(count)
+        try? await connectedPlayerCountMetric.update(count)
     }
 
     /**
@@ -93,8 +92,8 @@ final class TableManagement {
         try await player.update(on: database)
         let waitingTable = WaitingTable(newTable: table, user: player)
         self.tables[waitingTable.id] = waitingTable
-        logTableCount()
-        logPlayingPlayerCount()
+        await logTableCount()
+        await logPlayingPlayerCount()
         return waitingTable.tableInfo(forPlayer: player.name)
     }
     
@@ -127,7 +126,7 @@ final class TableManagement {
         player.$table.id = table.id
         try await player.update(on: database)
         table.sendUpdateToAllPlayers()
-        logPlayingPlayerCount()
+        await logPlayingPlayerCount()
         return table.tableInfo(forPlayer: player.name)
     }
 
@@ -159,7 +158,7 @@ final class TableManagement {
         player.$table.id = nil
         guard let table = WaitingTable(oldTable: oldTable, removing: player.name) else {
             tables[oldTable.id] = nil
-            logTableCount()
+            await logTableCount()
             try await player.update(on: database)
             try await Table.query(on: database).filter(\.$id == oldTable.id).delete()
             return
@@ -168,8 +167,8 @@ final class TableManagement {
         tables[table.id] = table
         #warning("Update points for all players, add penalty if running game")
         table.sendUpdateToAllPlayers()
-        logPlayingPlayerCount()
-        logConnectedPlayerCount()
+        await logPlayingPlayerCount()
+        await logConnectedPlayerCount()
         try await player.update(on: database)
     }
     
@@ -177,16 +176,21 @@ final class TableManagement {
         guard let table = currentTable(for: player) else {
             return false
         }
-        defer { logConnectedPlayerCount() }
-        return table.connect(player: player, using: socket)
+        let result = table.connect(player: player, using: socket)
+        Task {
+            await logConnectedPlayerCount()
+        }
+        return result
     }
     
     func disconnect(player: PlayerName) {
         guard let table = currentTable(for: player) else {
             return
         }
-        defer { logConnectedPlayerCount() }
         table.disconnect(player: player)
+        Task {
+            await logConnectedPlayerCount()
+        }
     }
     
     func performAction(player: PlayerName, action: PlayerAction) -> PlayerActionResult {
@@ -255,6 +259,8 @@ final class TableManagement {
     
     func disconnectAllSockets() {
         tables.values.forEach { $0.disconnectAllPlayers() }
-        logConnectedPlayerCount()
+        Task {
+            await logConnectedPlayerCount()
+        }
     }
 }