From 39ada951ca341561cdf17370095e459c335eef13 Mon Sep 17 00:00:00 2001 From: Mykola Buhaiov Date: Wed, 12 Jun 2024 10:58:50 +0300 Subject: [PATCH] fix: fix --- .../Extensions/Application+Extensions.swift | 8 +++++++- .../MongoHealthChecks/MongoRequest.swift | 13 ++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Sources/HealthChecks/Extensions/Application+Extensions.swift b/Sources/HealthChecks/Extensions/Application+Extensions.swift index e2a3a6a..9455c9f 100644 --- a/Sources/HealthChecks/Extensions/Application+Extensions.swift +++ b/Sources/HealthChecks/Extensions/Application+Extensions.swift @@ -234,8 +234,14 @@ extension Application { } /// Variable for `MongoDatabase` - public var mongoCluster: MongoCluster? { + public var healthCheckMongoCluster: MongoCluster? { get { storage[MongoClusterKey.self] } set { storage[MongoClusterKey.self] = newValue } } + + /// Initialize MongoDB + /// - Parameter connectionString: URI as `String`. Example: "mongodb://localhost/myapp + public func initializeHealthCheckMongoCluster(connectionString: String) async throws { + self.healthCheckMongoCluster = try await MongoCluster(connectingTo: ConnectionSettings(connectionString)) + } } diff --git a/Sources/HealthChecks/MongoHealthChecks/MongoRequest.swift b/Sources/HealthChecks/MongoHealthChecks/MongoRequest.swift index 43fec8b..16fd1a5 100644 --- a/Sources/HealthChecks/MongoHealthChecks/MongoRequest.swift +++ b/Sources/HealthChecks/MongoHealthChecks/MongoRequest.swift @@ -42,15 +42,10 @@ public final class MongoRequest: MongoRequestSendable { /// - Parameter port: `String` /// - Returns: `String` public func getConnection(by host: String, and port: String) async throws -> String { - let connection = "\(app.mongoCluster?.connectionState ?? .disconnected)" + let connection = "\(app.healthCheckMongoCluster?.connectionState ?? .disconnected)" + if connection.contains("disconnected") { + app.logger.error("ERROR: MongoDB not connect") + } return connection } } - -extension Application { - /// Initialize MongoDB - /// - Parameter connectionString: URI as `String`. Example: "mongodb://localhost/myapp - public func initializeMongoClusterLibrary(connectionString: String) async throws { - self.mongoCluster = try await MongoCluster(connectingTo: ConnectionSettings(connectionString)) - } -}