log under Database using specific call

couchbase · Oct 22, 2024 · 96a48a5 · 96a48a5
1 parent e7defe8
commit 96a48a5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 17 deletions.
diff --git a/Objective-C/CBLConsoleLogger.m b/Objective-C/CBLConsoleLogger.m
@@ -25,7 +25,6 @@ @implementation CBLConsoleLogger
 @synthesize level=_level, domains=_domains;
 
 static NSMutableDictionary<NSNumber *, os_log_t>* osLogDictionary;
-static os_log_t logger;
 static NSString* _sysID;
 
 - (instancetype) initWithLogLevel: (CBLLogLevel)level {
@@ -83,17 +82,8 @@ - (void) initializeOSLogDomains {
     #endif
 }
 
-+ (os_log_t) internalLogger {
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        logger = os_log_create([_sysID UTF8String], "Internal");
-    });
-    return logger;
-}
-
-+ (void) logWithInternal: (NSString*)message {
-    logger = [self internalLogger];
-    os_log(logger, "%@", message);
++ (void) logAlways: (NSString*)message {
+    os_log(osLogDictionary[@(kCBLLogDomainDatabase)], "%@", message);
 }
 
 @end
diff --git a/Objective-C/CBLDatabase.mm b/Objective-C/CBLDatabase.mm
@@ -123,7 +123,7 @@ + (void) initialize {
 + (void) CBLInit {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        [CBLConsoleLogger logWithInternal:[CBLVersion userAgent]];
+        [CBLConsoleLogger logAlways:[CBLVersion userAgent]];
         [self checkFileLogging];
     });
 }

diff --git a/Objective-C/CBLLog.mm b/Objective-C/CBLLog.mm
@@ -160,7 +160,7 @@ - (instancetype) initWithDefault {
         }
         if (callbackLogLevel != kC4LogWarning) {
             NSString* message = [NSString stringWithFormat: @"CouchbaseLite minimum log level is %s", kLevelNames[callbackLogLevel]];
-            [CBLConsoleLogger logWithInternal: message];
+            [CBLConsoleLogger logAlways: message];
         }
 #endif
 

diff --git a/Objective-C/Internal/CBLLog+Internal.h b/Objective-C/Internal/CBLLog+Internal.h
@@ -36,9 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype) initWithLogLevel: (CBLLogLevel)level;
 
-+ (os_log_t) internalLogger;
-
-+ (void) logWithInternal: (nonnull NSString*)message;
++ (void) logAlways: (nonnull NSString*)message;
 
 @end