Move to new Vapor main
This commit is contained in:
parent
eb10ae6626
commit
b2b3c74586
@ -13,25 +13,14 @@ let package = Package(
|
||||
.package(url: "https://github.com/christophhagen/ClairvoyantBinaryCodable", from: "0.3.1"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
.executableTarget(
|
||||
name: "App",
|
||||
dependencies: [
|
||||
.product(name: "Vapor", package: "vapor"),
|
||||
.product(name: "Clairvoyant", package: "Clairvoyant"),
|
||||
.product(name: "ClairvoyantVapor", package: "ClairvoyantVapor"),
|
||||
.product(name: "ClairvoyantBinaryCodable", package: "ClairvoyantBinaryCodable"),
|
||||
],
|
||||
swiftSettings: [
|
||||
// Enable better optimizations when building in Release configuration. Despite the use of
|
||||
// the `.unsafeFlags` construct required by SwiftPM, this flag is recommended for Release
|
||||
// builds. See <https://github.com/swift-server/guides/blob/main/docs/building.md#building-for-production> for details.
|
||||
.unsafeFlags(["-cross-module-optimization"], .when(configuration: .release))
|
||||
]
|
||||
),
|
||||
.executableTarget(name: "Run", dependencies: [.target(name: "App")]),
|
||||
.testTarget(name: "AppTests", dependencies: [
|
||||
.target(name: "App"),
|
||||
.product(name: "XCTVapor", package: "vapor"),
|
||||
])
|
||||
)
|
||||
]
|
||||
)
|
||||
|
@ -22,18 +22,8 @@ enum ServerError: Error {
|
||||
case invalidAuthenticationToken
|
||||
}
|
||||
|
||||
private func updateStatus(_ newStatus: ServerStatus) {
|
||||
asyncScheduler.schedule {
|
||||
do {
|
||||
try await status.update(newStatus)
|
||||
} catch {
|
||||
print("Failed to update server status: \(error)")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// configures your application
|
||||
public func configure(_ app: Application) throws {
|
||||
public func configure(_ app: Application) async throws {
|
||||
let storageFolder = URL(fileURLWithPath: app.directory.resourcesDirectory)
|
||||
|
||||
let configUrl = storageFolder.appendingPathComponent("config.json")
|
||||
@ -45,7 +35,7 @@ public func configure(_ app: Application) throws {
|
||||
MetricObserver.standard = monitor
|
||||
|
||||
status = Metric<ServerStatus>("sesame.status")
|
||||
updateStatus(.initializing)
|
||||
try await status.update(.initializing)
|
||||
|
||||
app.http.server.configuration.port = config.port
|
||||
|
||||
@ -61,12 +51,10 @@ public func configure(_ app: Application) throws {
|
||||
provider.registerRoutes(app)
|
||||
monitor.saveCurrentListOfMetricsToLogFolder()
|
||||
|
||||
updateStatus(.nominal)
|
||||
try await status.update(.nominal)
|
||||
|
||||
// Update the metric of the device status to ensure that it is accurate
|
||||
asyncScheduler.schedule {
|
||||
await deviceManager.updateDeviceConnectionMetric()
|
||||
}
|
||||
|
||||
log("[\(df.string(from: Date()))] Server started")
|
||||
}
|
||||
|
43
Sources/App/entrypoint.swift
Normal file
43
Sources/App/entrypoint.swift
Normal file
@ -0,0 +1,43 @@
|
||||
import Vapor
|
||||
import Dispatch
|
||||
import Logging
|
||||
|
||||
/// This extension is temporary and can be removed once Vapor gets this support.
|
||||
private extension Vapor.Application {
|
||||
static let baseExecutionQueue = DispatchQueue(label: "vapor.codes.entrypoint")
|
||||
|
||||
func runFromAsyncMainEntrypoint() async throws {
|
||||
try await withCheckedThrowingContinuation { continuation in
|
||||
Vapor.Application.baseExecutionQueue.async { [self] in
|
||||
do {
|
||||
try self.run()
|
||||
continuation.resume()
|
||||
} catch {
|
||||
continuation.resume(throwing: error)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@main
|
||||
enum Entrypoint {
|
||||
static func main() async throws {
|
||||
var env = try Environment.detect()
|
||||
try LoggingSystem.bootstrap(from: &env)
|
||||
|
||||
let app = Application(env)
|
||||
defer {
|
||||
shutdown()
|
||||
app.shutdown()
|
||||
}
|
||||
|
||||
do {
|
||||
try await configure(app)
|
||||
} catch {
|
||||
app.logger.report(error: error)
|
||||
throw error
|
||||
}
|
||||
try await app.runFromAsyncMainEntrypoint()
|
||||
}
|
||||
}
|
@ -1,13 +0,0 @@
|
||||
import App
|
||||
import Vapor
|
||||
|
||||
var env = Environment.production //.detect()
|
||||
try LoggingSystem.bootstrap(from: &env)
|
||||
let app = Application(env)
|
||||
defer {
|
||||
shutdown()
|
||||
app.shutdown()
|
||||
}
|
||||
|
||||
try configure(app)
|
||||
try app.run()
|
@ -1,13 +0,0 @@
|
||||
@testable import App
|
||||
import XCTVapor
|
||||
|
||||
final class AppTests: XCTestCase {
|
||||
|
||||
func testEncodingUInt32() {
|
||||
let input: UInt32 = 123
|
||||
let data = input.encoded
|
||||
let output = UInt32(data: data)
|
||||
XCTAssertEqual(input, output)
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue
Block a user