Print messages on start and shutdown
This commit is contained in:
parent
9bd7174bdd
commit
091d9554ad
@ -51,6 +51,13 @@ actor SQLiteDatabase {
|
|||||||
|
|
||||||
private let registeredPlayerCountMetric: Metric<Int>
|
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 {
|
init(database: Database, mail: Configuration.EMail?) async throws {
|
||||||
self.registeredPlayerCountMetric = Metric(
|
self.registeredPlayerCountMetric = Metric(
|
||||||
"schafkopf.players",
|
"schafkopf.players",
|
||||||
@ -60,6 +67,9 @@ actor SQLiteDatabase {
|
|||||||
self.mail = mail?.mailConfig
|
self.mail = mail?.mailConfig
|
||||||
|
|
||||||
await updateRegisteredPlayerCount(from: database)
|
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 {
|
func registerPlayer(named name: PlayerName, hash: PasswordHash, email: String?, in database: Database) async throws -> SessionToken {
|
||||||
@ -87,9 +97,13 @@ actor SQLiteDatabase {
|
|||||||
return token
|
return token
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private func playerCount(in database: Database) async throws -> Int {
|
||||||
|
try await User.query(on: database).count()
|
||||||
|
}
|
||||||
|
|
||||||
func updateRegisteredPlayerCount(from database: Database) async {
|
func updateRegisteredPlayerCount(from database: Database) async {
|
||||||
do {
|
do {
|
||||||
let count = try await User.query(on: database).count()
|
let count = try await playerCount(in: database)
|
||||||
_ = try? await registeredPlayerCountMetric.update(count)
|
_ = try? await registeredPlayerCountMetric.update(count)
|
||||||
} catch {
|
} catch {
|
||||||
log("Failed to update player count metric: \(error)")
|
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)
|
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()
|
await tables.disconnectAllSockets()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -23,6 +23,10 @@ final class TableManagement {
|
|||||||
/// The metric describing the number of players currently connected via a websocket
|
/// The metric describing the number of players currently connected via a websocket
|
||||||
private let connectedPlayerCountMetric: Metric<Int>
|
private let connectedPlayerCountMetric: Metric<Int>
|
||||||
|
|
||||||
|
var tableCount: Int {
|
||||||
|
tables.count
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Load the tables from a file in the storage folder
|
Load the tables from a file in the storage folder
|
||||||
- Throws: Errors when the file could not be read
|
- Throws: Errors when the file could not be read
|
||||||
@ -58,7 +62,6 @@ final class TableManagement {
|
|||||||
let id = table.id!
|
let id = table.id!
|
||||||
self.tables[id] = WaitingTable(id: id, name: table.name, isPublic: table.isPublic, players: table.players)
|
self.tables[id] = WaitingTable(id: id, name: table.name, isPublic: table.isPublic, players: table.players)
|
||||||
}
|
}
|
||||||
log("\(tables.count) tables loaded")
|
|
||||||
await logTableCount()
|
await logTableCount()
|
||||||
await logPlayingPlayerCount()
|
await logPlayingPlayerCount()
|
||||||
await logConnectedPlayerCount()
|
await logConnectedPlayerCount()
|
||||||
|
@ -9,7 +9,6 @@ var server: SQLiteDatabase!
|
|||||||
private var provider: VaporMetricProvider! = nil
|
private var provider: VaporMetricProvider! = nil
|
||||||
private var status: Metric<ServerStatus>!
|
private var status: Metric<ServerStatus>!
|
||||||
private let scheduler = MultiThreadedEventLoopGroup(numberOfThreads: 2)
|
private let scheduler = MultiThreadedEventLoopGroup(numberOfThreads: 2)
|
||||||
private var configurationError: Error? = nil
|
|
||||||
|
|
||||||
func configure(_ app: Application) async throws {
|
func configure(_ app: Application) async throws {
|
||||||
let resourceFolder = URL(fileURLWithPath: app.directory.resourcesDirectory)
|
let resourceFolder = URL(fileURLWithPath: app.directory.resourcesDirectory)
|
||||||
@ -73,11 +72,12 @@ func configure(_ app: Application) async throws {
|
|||||||
monitor.saveCurrentListOfMetricsToLogFolder()
|
monitor.saveCurrentListOfMetricsToLogFolder()
|
||||||
|
|
||||||
try await status.update(.nominal)
|
try await status.update(.nominal)
|
||||||
|
await server.printServerStartMessage()
|
||||||
}
|
}
|
||||||
|
|
||||||
func shutdown() {
|
func shutdown() {
|
||||||
scheduler.schedule {
|
Task {
|
||||||
await server.disconnectAllSockets()
|
await server.shutdown()
|
||||||
try await scheduler.shutdownGracefully()
|
try await scheduler.shutdownGracefully()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user