CBL-5396: Use os_log instead of NSLog for Console Log #3323
Conversation
|
For some reason, a test was hang for 14 hour. I just canceled it. |
| @@ -40,7 +40,8 @@ - (CBLDictionary*) predict: (CBLDictionary*)input { | |||
| NSString* inputWord = [input stringForKey: @"word"]; | |||
|
|
|||
| if (!inputWord) { | |||
| NSLog(@"No word input !!!"); | |||
| os_log_t log = os_log_create("CouchbaseLite", "OSLogging"); | |||
| os_log(log, "No word input !!!"); | |||
There was a problem hiding this comment.
For this one we can use NSLog, I guessed or change it to assertion instead of logging.
There was a problem hiding this comment.
changed to assert
Objective-C/CBLConsoleLogger.m
Outdated
| @@ -45,7 +45,8 @@ - (void) logWithLevel: (CBLLogLevel)level domain: (CBLLogDomain)domain message: | |||
|
|
|||
| NSString* levelName = CBLLog_GetLevelName(level); | |||
| NSString* domainName = CBLLog_GetDomainName(domain); | |||
| NSLog(@"CouchbaseLite %@ %@: %@", domainName, levelName, message); | |||
| os_log_t log = os_log_create("CouchbaseLite", "OSDebug"); | |||
There was a problem hiding this comment.
What is "OSDebug"? Where does it appear in the log?
There was a problem hiding this comment.
changed to com.couchbase.lite.ios and the category now represents a domain (CBL)
Objective-C/CBLDatabase.mm
Outdated
| @@ -115,7 +115,8 @@ to be done in CBLInit()which is called only once when the first CBLDatabase is c | |||
| */ | |||
| + (void) initialize { | |||
| if (self == [CBLDatabase class]) { | |||
| NSLog(@"%@", [CBLVersion userAgent]); | |||
| os_log_t log = os_log_create("CouchbaseLite", "OSLogging"); | |||
There was a problem hiding this comment.
What is "OSLogging"? Where does it appear in the log?
Objective-C/CBLConsoleLogger.m
Outdated
| @@ -45,7 +45,8 @@ - (void) logWithLevel: (CBLLogLevel)level domain: (CBLLogDomain)domain message: | |||
|
|
|||
| NSString* levelName = CBLLog_GetLevelName(level); | |||
| NSString* domainName = CBLLog_GetDomainName(domain); | |||
| NSLog(@"CouchbaseLite %@ %@: %@", domainName, levelName, message); | |||
| os_log_t log = os_log_create("CouchbaseLite", "OSDebug"); | |||
| os_log(log, "CouchbaseLite %@ %@: %@", domainName, levelName, message); | |||
There was a problem hiding this comment.
There are different types of os_log function based on the log level. I think we should use those functions. What is .NET using?
to be used with any additional in-code logging
|
|
||
| + (os_log_t) internalLogger { | ||
| if(!logger){ | ||
| logger = os_log_create("com.couchbase.lite.ios", "Log"); |
There was a problem hiding this comment.
This is not thread safe. You can use dispatch_once which is thread-safe to make it singleton.
| - (void) initializeOSLogDomains { | ||
| osLogDictionary = [NSMutableDictionary dictionary]; | ||
|
|
||
| osLogDictionary[@(kCBLLogDomainDatabase)] = os_log_create("com.couchbase.lite.ios", "Database"); |
There was a problem hiding this comment.
We should also get "com.ouchbase.lite.ios" from the framework bundle identifier instead of hard code the string here.
each LogLevel has been matched with a type of os_log - same behaviour as .NET
Additionally, os_log categories, mapped to DomainLevels, will now be created at the time logging is initialised, on open/create db. And every CBL log, with its specific domain, will now appear in its own corresponding category in console logs.
There are just a couple of NSLogs only for DEBUG, which for I've decided that the os_log object to be created dynamically as we dont care that much and based on those messages, there's an issue somewhere else anyway. The production ones will be generated as mentioned above.
Removed
CBLLog+Admin.has is no longer needed.