diff --git a/Package.swift b/Package.swift index 78f6b2d17..92c166a36 100644 --- a/Package.swift +++ b/Package.swift @@ -25,7 +25,7 @@ let package = Package( .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.8.0"), .package(url: "https://github.com/apple/swift-nio-extras.git", from: "1.3.0"), .package(url: "https://github.com/apple/swift-nio-transport-services.git", from: "1.5.1"), - .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"), + .package(url: "https://github.com/apple/swift-log.git", from: "1.4.0"), ], targets: [ .target( diff --git a/Sources/AsyncHTTPClient/HTTPClient.swift b/Sources/AsyncHTTPClient/HTTPClient.swift index e973b9891..aa4553eea 100644 --- a/Sources/AsyncHTTPClient/HTTPClient.swift +++ b/Sources/AsyncHTTPClient/HTTPClient.swift @@ -70,7 +70,7 @@ public class HTTPClient { var state: State private let stateLock = Lock() - internal static let loggingDisabled = Logger(label: "AHC-do-not-log", factory: { _ in NoOpLogHandler() }) + internal static let loggingDisabled = Logger(label: "AHC-do-not-log", factory: { _ in SwiftLogNoOpLogHandler() }) /// Create an `HTTPClient` with specified `EventLoopGroup` provider and configuration. /// diff --git a/Sources/AsyncHTTPClient/NoOpLogHandler.swift b/Sources/AsyncHTTPClient/NoOpLogHandler.swift deleted file mode 100644 index 26419547b..000000000 --- a/Sources/AsyncHTTPClient/NoOpLogHandler.swift +++ /dev/null @@ -1,40 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// This source file is part of the AsyncHTTPClient open source project -// -// Copyright (c) 2020 Apple Inc. and the AsyncHTTPClient project authors -// Licensed under Apache License v2.0 -// -// See LICENSE.txt for license information -// See CONTRIBUTORS.txt for the list of AsyncHTTPClient project authors -// -// SPDX-License-Identifier: Apache-2.0 -// -//===----------------------------------------------------------------------===// - -import Logging - -internal struct NoOpLogHandler: LogHandler { - func log(level: Logger.Level, message: Logger.Message, metadata: Logger.Metadata?, file: String, function: String, line: UInt) {} - - subscript(metadataKey _: String) -> Logger.Metadata.Value? { - get { - return nil - } - set {} - } - - var metadata: Logger.Metadata { - get { - return [:] - } - set {} - } - - var logLevel: Logger.Level { - get { - return .critical - } - set {} - } -}