From eb77ec86f7e76a4ce16a04f59df99ec2211f1c42 Mon Sep 17 00:00:00 2001
From: Adam Fowler <adamfowler71@gmail.com>
Date: Thu, 16 Jul 2020 15:50:40 +0100
Subject: [PATCH] Use SwiftLogNoOpLogHandler from swift-log

---
 Package.swift                                |  2 +-
 Sources/AsyncHTTPClient/HTTPClient.swift     |  2 +-
 Sources/AsyncHTTPClient/NoOpLogHandler.swift | 40 --------------------
 3 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 Sources/AsyncHTTPClient/NoOpLogHandler.swift

diff --git a/Package.swift b/Package.swift
index 96fab765c..a88a81690 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.7.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 6a5f19277..0bd919f15 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 {}
-    }
-}