ch/Schafkopf-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow custom data folder

Browse Source
This commit is contained in:
Christoph Hagen 2023-12-25 18:46:05 +01:00
parent 32055ecdec
commit 10194066db
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Resources/config_example.json
View File

@ -8,4 +8,5 @@
"tokenExpiryDuration": 15, "tokenExpiryDuration": 15,
}, },
"monitoringTokens": [], "monitoringTokens": [],
"dataDirectory" : "/data/schafkopf"
} }

14
Sources/App/Management/Configuration.swift
View File

@ -23,6 +23,13 @@ struct Configuration {
/// The number of minutes until a password reset token is no longer valid /// The number of minutes until a password reset token is no longer valid
let tokenExpiryDuration: Int 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 /// The authentication tokens to access the metrics
let monitoringTokens: Set<String> let monitoringTokens: Set<String>
@ -42,6 +49,13 @@ struct Configuration {
} }
return resourcesDirectory.appendingPathComponent(logPath) return resourcesDirectory.appendingPathComponent(logPath)
} }
func customDataDirectory(or publicDirectory: String) -> URL {
guard let dataDirectory else {
return URL(fileURLWithPath: publicDirectory)
}
return URL(fileURLWithPath: dataDirectory)
}
} }
extension Configuration { extension Configuration {

8
Sources/App/configure.swift
View File

@ -12,13 +12,14 @@ private let scheduler = MultiThreadedEventLoopGroup(numberOfThreads: 2)
private var configurationError: Error? = nil private var configurationError: Error? = nil
func configure(_ app: Application) async throws { 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) let configPath = URL(fileURLWithPath: app.directory.resourcesDirectory)
.appendingPathComponent("config.json") .appendingPathComponent("config.json")
let configuration = try Configuration(loadFromUrl: configPath) let configuration = try Configuration(loadFromUrl: configPath)
let logFolder = configuration.logURL(possiblyRelativeTo: storageFolder) let logFolder = configuration.logURL(possiblyRelativeTo: resourceFolder)
let monitor = MetricObserver( let monitor = MetricObserver(
logFileFolder: logFolder, logFileFolder: logFolder,
logMetricId: "schafkopf.log") logMetricId: "schafkopf.log")
@ -39,7 +40,8 @@ func configure(_ app: Application) async throws {
app.databases.use(.sqlite(.memory), as: .sqlite) app.databases.use(.sqlite(.memory), as: .sqlite)
default: default:
app.logger.logLevel = .notice 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)") log("[PRODUCTION] Using database at \(dbFile)")
app.databases.use(.sqlite(.file(dbFile)), as: .sqlite) app.databases.use(.sqlite(.file(dbFile)), as: .sqlite)
} }