Skip to content
Snippets Groups Projects
Commit d7d7369d authored by Dariusz Rybicki's avatar Dariusz Rybicki
Browse files

Use MessengerLogger

parent 8da55d33
No related branches found
No related tags found
2 merge requests!117Logging improvements,!102Release 1.0.0
......@@ -15,8 +15,7 @@ extension MessengerStartLogging {
public static func live(_ env: MessengerEnvironment) -> MessengerStartLogging {
return MessengerStartLogging {
env.registerLogWriter(.init { messageString in
let message = LogMessage.parse(messageString)
env.log(message)
env.logger(.parse(messageString))
})
}
}
......
import Foundation
import Logging
import XXClient
import XCTestDynamicOverlay
......@@ -19,7 +18,7 @@ public struct MessengerEnvironment {
public var isListeningForMessages: Stored<Bool>
public var isRegisteredWithUD: IsRegisteredWithUD
public var loadCMix: LoadCMix
public var log: (LogMessage) -> Void
public var logger: MessengerLogger
public var login: Login
public var lookupUD: LookupUD
public var messageListeners: ListenersRegistry
......@@ -51,9 +50,7 @@ extension MessengerEnvironment {
.path
public static func live() -> MessengerEnvironment {
let logger = Logger(label: "xx.network.client")
return MessengerEnvironment(
MessengerEnvironment(
authCallbacks: .live(),
backup: .inMemory(),
backupCallbacks: .live(),
......@@ -69,7 +66,7 @@ extension MessengerEnvironment {
isListeningForMessages: .inMemory(false),
isRegisteredWithUD: .live,
loadCMix: .live,
log: { logger.log(level: $0.level, .init(stringLiteral: $0.text)) },
logger: .live(),
login: .live,
lookupUD: .live,
messageListeners: .live(),
......@@ -112,7 +109,7 @@ extension MessengerEnvironment {
isListeningForMessages: .unimplemented(placeholder: false),
isRegisteredWithUD: .unimplemented,
loadCMix: .unimplemented,
log: XCTUnimplemented("\(Self.self).log"),
logger: .unimplemented,
login: .unimplemented,
lookupUD: .unimplemented,
messageListeners: .unimplemented,
......
......@@ -6,14 +6,14 @@ import XXClient
final class MessengerStartLoggingTests: XCTestCase {
func testStartLogging() {
var registeredLogWriters: [LogWriter] = []
var logMessages: [LogMessage] = []
var logs: [MessengerLogger.Log] = []
var env: MessengerEnvironment = .unimplemented
env.registerLogWriter.run = { writer in
registeredLogWriters.append(writer)
}
env.log = { message in
logMessages.append(message)
env.logger.run = { log, _, _, _ in
logs.append(log)
}
let start: MessengerStartLogging = .live(env)
......@@ -23,8 +23,8 @@ final class MessengerStartLoggingTests: XCTestCase {
registeredLogWriters.first?.handle("DEBUG Hello, World!")
XCTAssertNoDifference(logMessages, [
.init(level: .debug, text: "Hello, World!"),
XCTAssertNoDifference(logs, [
.init(level: .debug, message: "Hello, World!"),
])
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment