sushichop · sushichop · Jan 23, 2021 · Jan 23, 2021 · Jan 23, 2021 · Jan 23, 2021
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         make-tatget: [xcode-build, carthage-build-workaround, pod-lib-lint]
-        xcode: [12.2]
+        xcode: [12.3]
       fail-fast: false
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
@@ -30,7 +30,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        xcode: [12.2]
+        xcode: [12.3]
       fail-fast: false
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
@@ -46,7 +46,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        xcode: [12.2]
+        xcode: [12.3]
       fail-fast: false
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
@@ -59,7 +59,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        swift-version: [5.3.1]
+        swift-version: [5.3.2]
       fail-fast: false
     steps:
       - uses: actions/checkout@v2
@@ -70,7 +70,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        xcode: [12.2]
+        xcode: [12.3]
       fail-fast: false
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [x.y.z](https://github.com/sushichop/Puppy/releases/tag/x.y.z) (yyyy-mm-dd)
+
+- Instantiate `DispatchQueue` and add an argument named of `asynchronous`. [#9](https://github.com/sushichop/Puppy/pull/9)
+
 ## [0.1.2](https://github.com/sushichop/Puppy/releases/tag/0.1.2) (2020-12-05)
 
 - Support new API about FileHandle. [#7](https://github.com/sushichop/Puppy/pull/7)

diff --git a/Gemfile b/Gemfile
@@ -4,5 +4,5 @@ source "https://rubygems.org"
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
-gem "danger", "~> 8.1"
+gem "danger", "~> 8.2"
 gem "danger-swiftlint" 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -11,7 +11,7 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (8.1.0)
+    danger (8.2.2)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -24,16 +24,18 @@ GEM
       no_proxy_fix
       octokit (~> 4.7)
       terminal-table (~> 1)
-    danger-swiftlint (0.24.4)
+    danger-swiftlint (0.24.5)
       danger
       rake (> 10)
       thor (~> 0.19)
-    faraday (1.1.0)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
     faraday-http-cache (2.2.0)
       faraday (>= 0.8)
-    git (1.7.0)
+    faraday-net_http (1.0.1)
+    git (1.8.1)
       rchardet (~> 1.8)
     kramdown (2.3.0)
       rexml
@@ -42,15 +44,15 @@ GEM
     multipart-post (2.1.1)
     nap (1.1.0)
     no_proxy_fix (0.1.2)
-    octokit (4.18.0)
+    octokit (4.20.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
     public_suffix (4.0.6)
-    rake (13.0.1)
+    rake (13.0.3)
     rchardet (1.8.0)
     rexml (3.2.4)
-    ruby2_keywords (0.0.2)
+    ruby2_keywords (0.0.4)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -60,11 +62,11 @@ GEM
     unicode-display_width (1.7.0)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-19
 
 DEPENDENCIES
-  danger (~> 8.1)
+  danger (~> 8.2)
   danger-swiftlint
 
 BUNDLED WITH
-   2.1.4
+   2.2.6
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 .DEFAULT_GOAL := help
 HELP_INDENT := 28
 
-SWIFT_VERSION := 5.3.1
+SWIFT_VERSION := 5.3.2
 
 .PHONY: help
 help:

diff --git a/Package.resolved b/Package.resolved
@@ -3,7 +3,7 @@
     "pins": [
       {
         "package": "swift-log",
-        "repositoryURL": "https://github.com/apple/swift-log",
+        "repositoryURL": "https://github.com/apple/swift-log.git",
         "state": {
           "branch": null,
           "revision": "173f567a2dfec11d74588eea82cecea555bdc0bc",

diff --git a/Puppy.xcodeproj/project.pbxproj b/Puppy.xcodeproj/project.pbxproj
@@ -283,7 +283,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1200;
-				LastUpgradeCheck = 1220;
+				LastUpgradeCheck = 1230;
 				TargetAttributes = {
 					C78B9219252DCFBD0026B9B1 = {
 						CreatedOnToolsVersion = 12.0.1;

diff --git a/Puppy.xcodeproj/xcshareddata/xcschemes/Puppy.xcscheme b/Puppy.xcodeproj/xcshareddata/xcschemes/Puppy.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1230"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Puppy.xcodeproj/xcshareddata/xcschemes/SwiftLint.xcscheme b/Puppy.xcodeproj/xcshareddata/xcschemes/SwiftLint.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1230"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ Furthermore, it has file log rotation feature and you can also customize the log
 
 ### Basic Usage
 
-Logging to mutliple transports(e.g. console and file).
+Logging to mutliple transports(e.g. console and file). It is recommended that the first argument of each logger be a unique reverse-order FQDN since it is also used internally for a `DispatchQueue`'s label.
 
 ```Swift
 import Puppy

diff --git a/Sources/Puppy/BaseLogger.swift b/Sources/Puppy/BaseLogger.swift
@@ -3,6 +3,7 @@ import Foundation
 public protocol Loggerable {
 
     var label: String { get }
+    var queue: DispatchQueue? { get }
 
     func log(_ level: LogLevel, string: String)
 }
@@ -29,7 +30,7 @@ public class BaseLogger: Loggerable {
             formattedMessage = message
         }
 
-        if let queue = queue, asynchronous {
+        if let queue = queue {
             queue.async {
                 self.log(level, string: formattedMessage)
             }
@@ -38,13 +39,12 @@ public class BaseLogger: Loggerable {
         }
     }
 
-    public var asynchronous: Bool = true
+    public let label: String
+    public let queue: DispatchQueue?
 
-    public var label: String
-    public var queue: DispatchQueue? { return nil }
-
-    public init(_ label: String) {
+    public init(_ label: String, asynchronous: Bool = true) {
         self.label = label
+        self.queue = asynchronous ? DispatchQueue(label: label) : nil
     }
 
     public func log(_ level: LogLevel, string: String) {

diff --git a/Sources/Puppy/ConsoleLogger.swift b/Sources/Puppy/ConsoleLogger.swift
@@ -2,12 +2,6 @@ import Foundation
 
 public class ConsoleLogger: BaseLogger {
 
-    public override var queue: DispatchQueue! {
-        return Self.consoleLoggerQueue
-    }
-
-    private static let consoleLoggerQueue = DispatchQueue(label: "net.sushichop.puppy.consolelogger")
-
     public override func log(_ level: LogLevel, string: String) {
         print(string)
     }

diff --git a/Sources/Puppy/FileLogger.swift b/Sources/Puppy/FileLogger.swift
@@ -2,12 +2,6 @@ import Foundation
 
 public class FileLogger: BaseLogger {
 
-    public override var queue: DispatchQueue! {
-        return Self.fileLoggerQueue
-    }
-
-    private static let fileLoggerQueue = DispatchQueue(label: "net.sushichop.puppy.filelogger")
-
     public var flushmode: FlushMode = .always
 
     private var fileHandle: FileHandle!
@@ -43,7 +37,7 @@ public class FileLogger: BaseLogger {
 
     public func delete(_ url: URL) throws {
         do {
-            try queue.sync {
+            try queue!.sync {
                 try FileManager.default.removeItem(at: url)
             }
         } catch {
@@ -52,7 +46,7 @@ public class FileLogger: BaseLogger {
     }
 
     public func flush() {
-        queue.sync {
+        queue!.sync {
             fileHandle?.synchronizeFile()
         }
     }

diff --git a/Sources/Puppy/FileRotationLogger.swift b/Sources/Puppy/FileRotationLogger.swift
@@ -2,12 +2,6 @@ import Foundation
 
 public class FileRotationLogger: BaseLogger {
 
-    public override var queue: DispatchQueue! {
-        return Self.fileRotationLoggerQueue
-    }
-
-    private static let fileRotationLoggerQueue = DispatchQueue(label: "net.sushichop.puppy.filerotationlogger")
-
     public typealias ByteCount = UInt64
     public var maxFileSize: ByteCount = 10 * 1024 * 1024
     public var maxArchivedFilesCount: UInt8 = 5
@@ -48,7 +42,7 @@ public class FileRotationLogger: BaseLogger {
 
     public func delete(_ url: URL) throws {
         do {
-            try queue.sync {
+            try queue!.sync {
                 try FileManager.default.removeItem(at: url)
             }
         } catch {

diff --git a/Sources/Puppy/LogColor.swift b/Sources/Puppy/LogColor.swift
@@ -6,7 +6,6 @@ import Foundation
 /// [ANSI escape code](https://en.wikipedia.org/wiki/ANSI_escape_code)
 /// [256 COLORS - CHEAT SHEET](https://jonasjacek.github.io/colors/)
 public enum LogColor {
-
     case black
     case red
     case green

diff --git a/Sources/Puppy/OSLogger.swift b/Sources/Puppy/OSLogger.swift
@@ -5,17 +5,11 @@ import os.log
 
 public class OSLogger: BaseLogger {
 
-    public override var queue: DispatchQueue! {
-        return Self.osLoggerQueue
-    }
-
-    private static let osLoggerQueue = DispatchQueue(label: "net.sushichop.puppy.oslogger")
-
     private let osLog: OSLog
 
-    public init(_ label: String, category: String = "Puppy") {
+    public init(_ label: String, asynchronous: Bool = true, category: String = "Puppy") {
         self.osLog = OSLog(subsystem: label, category: category)
-        super.init(label)
+        super.init(label, asynchronous: asynchronous)
     }
 
     public override func log(_ level: LogLevel, string: String) {

diff --git a/Sources/Puppy/Puppy.swift b/Sources/Puppy/Puppy.swift
@@ -7,6 +7,7 @@ import Foundation
 typealias Log = Puppy
 
 public class Puppy {
+
     public static var useDebug = false
     public static let `default` = Puppy()
 

diff --git a/Sources/Puppy/PuppyLogHandler.swift b/Sources/Puppy/PuppyLogHandler.swift
@@ -4,6 +4,7 @@ import Foundation
 import Logging
 
 public struct PuppyLogHandler: LogHandler {
+
     public var logLevel: Logger.Level = .info
     public var metadata: Logger.Metadata
 

diff --git a/Sources/Puppy/SystemLogger.swift b/Sources/Puppy/SystemLogger.swift
@@ -5,12 +5,6 @@ import CPuppy
 
 public class SystemLogger: BaseLogger {
 
-    public override var queue: DispatchQueue! {
-        return Self.systemLoggerQueue
-    }
-
-    private static let systemLoggerQueue = DispatchQueue(label: "net.sushichop.puppy.systemlogger")
-
     public override func log(_ level: LogLevel, string: String) {
         string.withCString {
             let priority = logPriority(level)

diff --git a/Tests/PuppyTests/BaseLoggerTests.swift b/Tests/PuppyTests/BaseLoggerTests.swift
@@ -20,23 +20,24 @@ class BaseLoggerTests: XCTestCase {
         log.debug("DEBUG message using BaseLogger")
         baseLogger.logLevel = .notice
         log.info("🐛 INFO message but THIS MESSAGE MUST NOT DISPLAYED using BaseLogger")
-        log.notice("NOTICE message using ConsoleLogger")
+        log.notice("NOTICE message using BaseLogger")
         baseLogger.enabled = false
         log.notice("🐛 NOTICE message but THIS MESSAGE MUST NOT DISPLAYED using BaseLogger")
 
         log.remove(baseLogger)
     }
 
     func testMockLoggerSynchronous() throws {
-        let mockLogger = MockLogger("com.example.yourapp.mocklogger.sync")
-        mockLogger.asynchronous = false
+        let mockLogger = MockLogger("com.example.yourapp.mocklogger.sync", asynchronous: false)
+        XCTAssertNil(mockLogger.queue)
+
         let log = Puppy()
         log.add(mockLogger, withLevel: .debug)
-
         log.trace("TRACE message")
         log.verbose("VERBOSE message")
         log.debug("DEBUG message")
         log.info("INFO message")
+
         mockLogger.enabled = false
         log.notice("NOTICE message")
         log.warning("WARNING message")
@@ -55,13 +56,15 @@ class BaseLoggerTests: XCTestCase {
 
     func testMockLoggerAsynchronous() throws {
         let mockLogger = MockLogger("com.example.yourapp.mocklogger.async")
+        XCTAssertNotNil(mockLogger.queue)
+
         let log = Puppy()
         log.add(mockLogger, withLevel: .debug)
         log.debug("DEBUG message")
         log.warning("WARNING message")
 
         let exp = XCTestExpectation(description: "MockLogger Asynchronous")
-        mockLogger.queue.async {
+        mockLogger.queue!.async {
             XCTAssertEqual(mockLogger.invokedLogCount, 2)
             XCTAssertEqual(mockLogger.invokedLogLevels, [.debug, .warning])
             XCTAssertEqual(mockLogger.invokedLogStrings, ["DEBUG message", "WARNING message"])
@@ -84,7 +87,7 @@ class BaseLoggerTests: XCTestCase {
         log.error("ERROR message", tag: "error-tag")
 
         let exp = XCTestExpectation(description: "MockLogger LogFormatter")
-        mockLogger.queue.async {
+        mockLogger.queue!.async {
             XCTAssertEqual(mockLogger.invokedLogCount, 2)
             XCTAssertEqual(mockLogger.invokedLogLevels, [.warning, .error])
             XCTAssertEqual(mockLogger.invokedLogStrings, [