-log remove the LoggerWithSource for the time being

apple · Jul 6, 2020 · 8058ed5 · 8058ed5
1 parent 11a2ec7
commit 8058ed5
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 365 deletions.
diff --git a/Sources/Logging/LoggerWithSource.swift b/Sources/Logging/LoggerWithSource.swift
diff --git a/Sources/Logging/Logging.swift b/Sources/Logging/Logging.swift
@@ -27,8 +27,6 @@ import Glibc
 /// and the selected `LogHandler`). Therefore, `Logger`s are suitable to be passed around between libraries if you want
 /// to preserve metadata across libraries.
 ///
-/// - seeAlso: `LoggerWithSource` if you'd like to attach a customized source to every log message.
-///
 /// The most basic usage of a `Logger` is
 ///
 ///     logger.info("Hello World!")
@@ -410,10 +408,6 @@ extension Logger {
     public init(label: String, factory: (String) -> LogHandler) {
         self = Logger(label: label, factory(label))
     }
-
-    public func withSource(_ source: String) -> LoggerWithSource {
-        return LoggerWithSource(self, source: source)
-    }
 }
 
 extension Logger.Level {
@@ -569,7 +563,7 @@ public struct MultiplexLogHandler: LogHandler {
                     function: String,
                     line: UInt) {
         for handler in self.handlers where handler.logLevel <= level {
-            handler.log(level: level, message: message, metadata: metadata, file: file, function: function, line: line)
+            handler.log(level: level, message: message, metadata: metadata, source: source, file: file, function: function, line: line)
         }
     }
 

diff --git a/Tests/LoggingTests/CompatibilityTest+XCTest.swift b/Tests/LoggingTests/CompatibilityTest+XCTest.swift
@@ -25,7 +25,6 @@ import XCTest
 extension CompatibilityTest {
     static var allTests: [(String, (CompatibilityTest) -> () throws -> Void)] {
         return [
-            ("testAllLogLevelsWorkWithOldSchoolLogHandlerButSourceIsNotPropagated", testAllLogLevelsWorkWithOldSchoolLogHandlerButSourceIsNotPropagated),
             ("testAllLogLevelsWorkWithOldSchoolLogHandlerWorks", testAllLogLevelsWorkWithOldSchoolLogHandlerWorks),
         ]
     }

diff --git a/Tests/LoggingTests/CompatibilityTest.swift b/Tests/LoggingTests/CompatibilityTest.swift
@@ -16,32 +16,6 @@
 import XCTest
 
 final class CompatibilityTest: XCTestCase {
-    func testAllLogLevelsWorkWithOldSchoolLogHandlerButSourceIsNotPropagated() {
-        let testLogging = OldSchoolTestLogging()
-
-        var logger = LoggerWithSource(Logger(label: "\(#function)",
-                                             factory: testLogging.make),
-                                      source: "my-fancy-source")
-        logger.logLevel = .trace
-
-        logger.trace("yes: trace")
-        logger.debug("yes: debug")
-        logger.info("yes: info")
-        logger.notice("yes: notice")
-        logger.warning("yes: warning")
-        logger.error("yes: error")
-        logger.critical("yes: critical")
-
-        // Please note that the source is _not_ propagated (because the backend doesn't support it).
-        testLogging.history.assertExist(level: .trace, message: "yes: trace", source: "no source")
-        testLogging.history.assertExist(level: .debug, message: "yes: debug", source: "no source")
-        testLogging.history.assertExist(level: .info, message: "yes: info", source: "no source")
-        testLogging.history.assertExist(level: .notice, message: "yes: notice", source: "no source")
-        testLogging.history.assertExist(level: .warning, message: "yes: warning", source: "no source")
-        testLogging.history.assertExist(level: .error, message: "yes: error", source: "no source")
-        testLogging.history.assertExist(level: .critical, message: "yes: critical", source: "no source")
-    }
-
     func testAllLogLevelsWorkWithOldSchoolLogHandlerWorks() {
         let testLogging = OldSchoolTestLogging()
 

diff --git a/Tests/LoggingTests/LoggingTest+XCTest.swift b/Tests/LoggingTests/LoggingTest+XCTest.swift
@@ -50,8 +50,6 @@ extension LoggingTest {
             ("testStreamLogHandlerOutputFormatWithMetaData", testStreamLogHandlerOutputFormatWithMetaData),
             ("testStdioOutputStreamFlush", testStdioOutputStreamFlush),
             ("testOverloadingError", testOverloadingError),
-            ("testAllLogLevelsWorkOnLoggerWithSource", testAllLogLevelsWorkOnLoggerWithSource),
-            ("testLoggerWithSource", testLoggerWithSource),
         ]
     }
 }