Scope: disabled category fix

Sources/DLog/Atomic.swift

@@ -35,14 +35,14 @@ func synchronized<T : AnyObject, U>(_ obj: T, closure: () -> U) -> U {
 }
 
 @propertyWrapper
-class Atomic<T> {
+public class Atomic<T> {
 	private var value: T
 
-	init(wrappedValue value: T) {
+	public init(wrappedValue value: T) {
 		self.value = value
 	}
 
-	var wrappedValue: T {
+	public var wrappedValue: T {
 		get {
 			synchronized(self) { value }
 		}

Sources/DLog/DLog.swift

@@ -131,12 +131,16 @@ public class DLog: LogProtocol {
 
 	func enter(scope: LogScope) {
 		guard let out = output else { return }
-        out.scopeEnter(scope: scope)
+    ScopeStack.shared.append(scope) {
+      out.scopeEnter(scope: scope)
+    }
 	}
 
 	func leave(scope: LogScope) {
 		guard let out = output else { return }
-        out.scopeLeave(scope: scope)
+    ScopeStack.shared.remove(scope) {
+      out.scopeLeave(scope: scope)
+    }
 	}
 
 	// Interval

Sources/DLog/LogScope.swift

@@ -66,15 +66,16 @@ class ScopeStack {
 /// Scope provides a mechanism for grouping log messages.
 ///
 public class LogScope: LogProtocol {
-    var time = Date()
+    @Atomic var time = Date()
+
     var os_state = os_activity_scope_state_s()
 
     /// A global level in the stack.
     @objc
     public internal(set) var level: Int = 0
 
     /// A time duration.
-    public private(set) var duration: TimeInterval = 0
+    @Atomic public private(set) var duration: TimeInterval = 0
 
     /// Scope name.
     @objc
@@ -101,11 +102,9 @@ public class LogScope: LogProtocol {
     ///
     @objc
     public func enter() {
-        ScopeStack.shared.append(self) {
-            time = Date()
-            duration = 0
-            logger.enter(scope: self)
-        }
+      time = Date()
+      duration = 0
+      logger.enter(scope: self)
     }
 
     /// Finish a scope.
@@ -123,9 +122,7 @@ public class LogScope: LogProtocol {
     ///
     @objc
     public func leave() {
-        ScopeStack.shared.remove(self) {
-            duration = -time.timeIntervalSinceNow
-            logger.leave(scope: self)
-        }
+      duration = -time.timeIntervalSinceNow
+      logger.leave(scope: self)
     }
 }

Tests/DLogTests/DLogTests.swift

@@ -1181,6 +1181,19 @@ final class ScopeTests: XCTestCase {
 		scope.leave()
 		XCTAssert(0.25 <= scope.duration)
 	}
+
+  func test_disabled_category() {
+    let logger = DLog()
+    let category = DLog.disabled
+
+    category.scope("scope1") { scope1 in
+      scope1.scope("scope2") { scope2 in
+        logger.scope("scope3") { scope3 in
+          XCTAssert(scope3.debug("log")?.match(#"\#(CategoryTag) ├ \#(DebugTag) \#(Location) log"#) == true)
+        }
+      }
+    }
+  }
 }
 
 final class TraceTests: XCTestCase {