Skip to content

Commit 1547090

Browse files
committed
Fix applying of formatters and remove redundant method from Logger. Bump to 1.2.0
1 parent 5834520 commit 1547090

File tree

3 files changed

+21
-9
lines changed

3 files changed

+21
-9
lines changed

Cosmic.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = "Cosmic"
4-
s.version = "1.1.0"
4+
s.version = "1.2.0"
55
s.summary = "A log reporting framework written in Swift"
66

77
s.description = <<-DESC

Sources/Cosmic/Base/Logger.swift

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,7 @@ public extension Logger {
7474
private func enabled(_ expected: LogLevel) -> Bool {
7575
return (expected.rawValue >= logLevel.rawValue) && !self.isFiltered
7676
}
77-
78-
public func log(_ message: String, logLevel: LogLevel, metadata: LogMetadata = LogMetadata()) {
79-
log(format(message), logLevel: logLevel, metadata: metadata)
80-
}
77+
8178

8279
// MARK: debug
8380

@@ -89,7 +86,7 @@ public extension Logger {
8986
/// - Parameter messages: The messages to log
9087
public func debug(_ message: String, file: StaticString = #file, line: UInt = #line, function: StaticString = #function) {
9188
guard enabled(.debug) else { return }
92-
log(message, logLevel: .debug, metadata: LogMetadata(file: file, line: line, function: function))
89+
log(format(message), logLevel: .debug, metadata: LogMetadata(file: file, line: line, function: function))
9390
}
9491

9592
// MARK: info
@@ -105,7 +102,7 @@ public extension Logger {
105102
/// - Parameter messages: The info messages to log
106103
public func info(_ message: String, file: StaticString = #file, line: UInt = #line, function: StaticString = #function) {
107104
guard enabled(.info) else { return }
108-
log(message, logLevel: .info, metadata: LogMetadata(file: file, line: line, function: function))
105+
log(format(message), logLevel: .info, metadata: LogMetadata(file: file, line: line, function: function))
109106
}
110107

111108
// MARK: warn
@@ -118,7 +115,7 @@ public extension Logger {
118115
/// - Parameter messages: The warning messages to log
119116
public func warn(_ message: String, file: StaticString = #file, line: UInt = #line, function: StaticString = #function) {
120117
guard enabled(.warn) else { return }
121-
log(message, logLevel: .warn, metadata: LogMetadata(file: file, line: line, function: function))
118+
log(format(message), logLevel: .warn, metadata: LogMetadata(file: file, line: line, function: function))
122119
}
123120

124121
// MARK: error
@@ -135,7 +132,7 @@ public extension Logger {
135132
/// - Parameter messages: The error messages to log
136133
public func error(_ message: String, file: StaticString = #file, line: UInt = #line, function: StaticString = #function) {
137134
guard enabled(.error) else { return }
138-
log(message, logLevel: .error, metadata: LogMetadata(file: file, line: line, function: function))
135+
log(format(message), logLevel: .error, metadata: LogMetadata(file: file, line: line, function: function))
139136
}
140137

141138
internal func format(_ message: String) -> String {

Tests/CosmicTests/LoggerTests.swift

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,19 @@ class LoggerTests: XCTestCase {
4040

4141
}
4242

43+
func testFormatters() {
44+
45+
let logger = MemoryLogger()
46+
logger.logLevel = .info
47+
48+
logger.formatters.append(BasicLogFormatter(prefix: "Prefix "))
49+
50+
logger.info("Message")
51+
52+
let entries = logger.cache.entriesFor(logLevel: .info)
53+
54+
XCTAssertEqual(entries.count, 1)
55+
XCTAssertEqual(entries.first?.message, "Prefix Message")
56+
}
57+
4358
}

0 commit comments

Comments
 (0)