Use json configuration
Delete paths.conf
This commit is contained in:
parent
09046bb320
commit
ce1e141ca4
4
Resources/config.json
Normal file
4
Resources/config.json
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"logPath": "\/var\/log\/caps.log",
|
||||||
|
"serveFiles": true
|
||||||
|
}
|
@ -1,2 +0,0 @@
|
|||||||
/data/logs/caps/server.log
|
|
||||||
/data/servers/caps/Public
|
|
16
Sources/App/Config.swift
Normal file
16
Sources/App/Config.swift
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
import Foundation
|
||||||
|
|
||||||
|
struct Config: Codable {
|
||||||
|
|
||||||
|
let logPath: String
|
||||||
|
|
||||||
|
let serveFiles: Bool
|
||||||
|
|
||||||
|
var logURL: URL {
|
||||||
|
.init(fileURLWithPath: logPath)
|
||||||
|
}
|
||||||
|
|
||||||
|
static var `default`: Config {
|
||||||
|
.init(logPath: "/var/log/caps.log", serveFiles: true)
|
||||||
|
}
|
||||||
|
}
|
@ -1,35 +1,38 @@
|
|||||||
import Vapor
|
import Vapor
|
||||||
|
import Foundation
|
||||||
|
|
||||||
|
|
||||||
private(set) var server: CapServer!
|
private(set) var server: CapServer!
|
||||||
|
|
||||||
// configures your application
|
|
||||||
public func configure(_ app: Application) throws {
|
public func configure(_ app: Application) throws {
|
||||||
// uncomment to serve files from /Public folder
|
|
||||||
// app.middleware.use(FileMiddleware(publicDirectory: app.directory.publicDirectory))
|
|
||||||
|
|
||||||
app.http.server.configuration.port = 6001
|
app.http.server.configuration.port = 6001
|
||||||
app.routes.defaultMaxBodySize = "2mb"
|
app.routes.defaultMaxBodySize = "2mb"
|
||||||
|
|
||||||
let configFile = URL(fileURLWithPath: app.directory.resourcesDirectory)
|
let configFile = URL(fileURLWithPath: app.directory.resourcesDirectory)
|
||||||
.appendingPathComponent("paths.conf")
|
.appendingPathComponent("config.json")
|
||||||
let configData = try String(contentsOf: configFile)
|
let config: Config
|
||||||
.components(separatedBy: "\n")
|
if !FileManager.default.fileExists(atPath: configFile.path) {
|
||||||
.map { $0.trimmingCharacters(in: .whitespaces) }
|
config = .default
|
||||||
.filter { !$0.isEmpty }
|
let configData = try JSONEncoder().encode(config)
|
||||||
guard configData.count >= 2 else {
|
try configData.write(to: configFile)
|
||||||
print("Invalid configuration file: \(configData.count) lines")
|
print("Wrote default configuration")
|
||||||
throw CapError.invalidConfiguration
|
} else {
|
||||||
|
let configData = try Data(contentsOf: configFile)
|
||||||
|
config = try JSONDecoder().decode(Config.self, from: configData)
|
||||||
}
|
}
|
||||||
let logFile = URL(fileURLWithPath: configData[0])
|
|
||||||
let publicDirectory = URL(fileURLWithPath: configData[1])
|
try Log.set(logFile: config.logPath)
|
||||||
|
|
||||||
try Log.set(logFile: logFile.path)
|
let publicDirectory = app.directory.publicDirectory
|
||||||
|
if config.serveFiles {
|
||||||
server = try CapServer(in: publicDirectory)
|
let middleware = FileMiddleware(publicDirectory: publicDirectory)
|
||||||
|
app.middleware.use(middleware)
|
||||||
|
}
|
||||||
|
|
||||||
|
server = try CapServer(in: URL(fileURLWithPath: publicDirectory))
|
||||||
try server.loadCapNames()
|
try server.loadCapNames()
|
||||||
|
|
||||||
// Register routes to the router
|
// Register routes to the router
|
||||||
try routes(app)
|
try routes(app)
|
||||||
// Configure the rest of your application here
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user