Print messages on start and shutdown

Public/api.js

@@ -8,7 +8,7 @@
  If the server runs under https://example.com/schafkopf
  then apiPath = "/schafkopf"
  */
-const apiPath = "/schafkopf"
+const apiPath = ""
 
 var useEnglishTexts = false
 

Resources/config_example.json

@@ -1,6 +1,5 @@
 {
     "serverPort": 8000,
-    "production": false,
     "mail": {
         "serverDomain": "https://example.com/schafkopf",
         "emailHostname": "example.com",
@@ -9,4 +8,5 @@
         "tokenExpiryDuration": 15,
     },
     "monitoringTokens": [],
+    "dataDirectory" : "/data/schafkopf"
 }

Sources/App/Management/Configuration.swift

@@ -6,13 +6,6 @@ struct Configuration {
 
     let mail: EMail?
 
-    /**
-     Use a database file and reduce logging.
-
-     If this property is set to `false`, then an in-memory database is used with increased logging.
-     */
-    let production: Bool
-
     struct EMail {
 
         /// The url to the root of the server
@@ -31,6 +24,13 @@ struct Configuration {
         let tokenExpiryDuration: Int
     }
     
+    /**
+     The folder where the data should be stored.
+     
+     If the folder is set to `nil`, then the `Resources` folder is used.
+     */
+    let dataDirectory: String?
+
     /// The authentication tokens to access the metrics
     let monitoringTokens: Set<String>
     
@@ -49,6 +49,13 @@ struct Configuration {
         }
         return resourcesDirectory.appendingPathComponent(logPath)
     }
+    
+    func customDataDirectory(or publicDirectory: String) -> URL {
+        guard let dataDirectory else {
+            return URL(fileURLWithPath: publicDirectory)
+        }
+        return URL(fileURLWithPath: dataDirectory)
+    }
 }
 
 extension Configuration {

Sources/App/Management/SQLiteDatabase.swift

@@ -51,6 +51,13 @@ actor SQLiteDatabase {
 
     private let registeredPlayerCountMetric: Metric<Int>
     
+    private let dateFormatter = DateFormatter()
+    
+    func printServerStartMessage() async {
+        let players = await registeredPlayerCountMetric.lastValue()?.value ?? 0
+        log("[\(dateFormatter.string(from: Date()))] Server started (\(players) players, \(tables.tableCount) tables)")
+    }
+
     init(database: Database, mail: Configuration.EMail?) async throws {
         self.registeredPlayerCountMetric = Metric(
             "schafkopf.players",
@@ -60,6 +67,9 @@ actor SQLiteDatabase {
         self.mail = mail?.mailConfig
 
         await updateRegisteredPlayerCount(from: database)
+        
+        dateFormatter.dateStyle = .short
+        dateFormatter.timeStyle = .short
     }
 
     func registerPlayer(named name: PlayerName, hash: PasswordHash, email: String?, in database: Database) async throws -> SessionToken {
@@ -87,9 +97,13 @@ actor SQLiteDatabase {
         return token
     }
     
+    private func playerCount(in database: Database) async throws -> Int {
+        try await User.query(on: database).count()
+    }
+
     func updateRegisteredPlayerCount(from database: Database) async {
         do {
-            let count = try await User.query(on: database).count()
+            let count = try await playerCount(in: database)
             _ = try? await registeredPlayerCountMetric.update(count)
         } catch {
             log("Failed to update player count metric: \(error)")
@@ -320,7 +334,12 @@ actor SQLiteDatabase {
         return try await tables.play(card: card, player: player, in: database)
     }
     
-    func disconnectAllSockets() async {
+    func shutdown() async {
+        await disconnectAllSockets()
+        log("[\(dateFormatter.string(from: Date()))] Server shutdown")
+    }
+    
+    private func disconnectAllSockets() async {
         await tables.disconnectAllSockets()
     }
 }

Sources/App/Management/TableManagement.swift

@@ -23,6 +23,10 @@ final class TableManagement {
     /// The metric describing the number of players currently connected via a websocket
     private let connectedPlayerCountMetric: Metric<Int>
     
+    var tableCount: Int {
+        tables.count
+    }
+
     /**
      Load the tables from a file in the storage folder
      - Throws: Errors when the file could not be read
@@ -58,7 +62,6 @@ final class TableManagement {
             let id = table.id!
             self.tables[id] = WaitingTable(id: id, name: table.name, isPublic: table.isPublic, players: table.players)
         }
-        log("\(tables.count) tables loaded")
         await logTableCount()
         await logPlayingPlayerCount()
         await logConnectedPlayerCount()

Sources/App/configure.swift

@@ -9,16 +9,16 @@ var server: SQLiteDatabase!
 private var provider: VaporMetricProvider! = nil
 private var status: Metric<ServerStatus>!
 private let scheduler = MultiThreadedEventLoopGroup(numberOfThreads: 2)
-private var configurationError: Error? = nil
 
 func configure(_ app: Application) async throws {
-    let storageFolder = URL(fileURLWithPath: app.directory.resourcesDirectory)
+    let resourceFolder = URL(fileURLWithPath: app.directory.resourcesDirectory)
+    let publicDirectory = app.directory.publicDirectory
     
     let configPath = URL(fileURLWithPath: app.directory.resourcesDirectory)
         .appendingPathComponent("config.json")
     let configuration = try Configuration(loadFromUrl: configPath)
 
-    let logFolder = configuration.logURL(possiblyRelativeTo: storageFolder)
+    let logFolder = configuration.logURL(possiblyRelativeTo: resourceFolder)
     let monitor = MetricObserver(
         logFileFolder: logFolder,
         logMetricId: "schafkopf.log")
@@ -33,19 +33,18 @@ func configure(_ app: Application) async throws {
 
     app.http.server.configuration.port = configuration.serverPort
 
-    // Set target environment
+    switch app.environment {
-    app.environment = .production
+    case .production:
-
-    if !configuration.production {
-        app.logger.logLevel = .info
-        log("[DEVELOPMENT] Using in-memory database")
-        app.databases.use(.sqlite(.memory), as: .sqlite)
-    } else {
         app.logger.logLevel = .notice
-        let dbFile = storageFolder.appendingPathComponent("db.sqlite").path
+        let dataDirectory = configuration.customDataDirectory(or: publicDirectory)
+        let dbFile = dataDirectory.appendingPathComponent("db.sqlite").path
         log("[PRODUCTION] Using database at \(dbFile)")
         app.databases.use(.sqlite(.file(dbFile)), as: .sqlite)
+    default:
+        log("[DEVELOPMENT] Using in-memory database")
+        app.databases.use(.sqlite(.memory), as: .sqlite)
     }
+
     app.migrations.add(UserTableMigration())
     app.migrations.add(PasswordResetMigration())
 
@@ -70,13 +69,15 @@ func configure(_ app: Application) async throws {
     provider = .init(observer: monitor, accessManager: configuration.monitoringTokens)
     provider.asyncScheduler = scheduler
     provider.registerRoutes(app)
+    monitor.saveCurrentListOfMetricsToLogFolder()
 
     try await status.update(.nominal)
+    await server.printServerStartMessage()
 }
 
 func shutdown() {
-    scheduler.schedule {
+    Task {
-        await server.disconnectAllSockets()
+        await server.shutdown()
         try await scheduler.shutdownGracefully()
     }
 }