diff --git a/CHANGELOG.md b/CHANGELOG.md index b9051289a6..99be4d18f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,6 @@ x.y.z Release notes (yyyy-MM-dd) ============================================================= ### Enhancements -* None. -* Update release packaging for Xcode 15.4. * Added support for filtering logs by category. Users wil have more fine grained control over the log level for each category as well. ```swift diff --git a/Realm/RLMLogger_Private.h b/Realm/RLMLogger_Private.h index be8af0c0c9..b831937d37 100644 --- a/Realm/RLMLogger_Private.h +++ b/Realm/RLMLogger_Private.h @@ -35,7 +35,7 @@ RLM_HEADER_AUDIT_BEGIN(nullability) Log a message to the supplied level. @param logLevel The log level for the message. - @param category The log category name for the message. + @param categoryName The log category name for the message. @param message The message to log. */ - (void)logWithLevel:(RLMLogLevel)logLevel categoryName:(NSString *)categoryName message:(NSString *)message; diff --git a/Realm/Tests/RealmTests.mm b/Realm/Tests/RealmTests.mm index 8411f5769e..af03653b79 100644 --- a/Realm/Tests/RealmTests.mm +++ b/Realm/Tests/RealmTests.mm @@ -2962,7 +2962,7 @@ - (void)testSetDefaultLogLevel { __block NSMutableString *logs = [[NSMutableString alloc] init]; RLMLogCategory category = RLMLogCategoryRealm; RLMLogger *logger = [[RLMLogger alloc] initWithLogFunction:^(RLMLogLevel level, RLMLogCategory category, NSString *message) { - [logs appendFormat:@" %@ %lu %@", [NSDate date], level, message]; + [logs appendFormat:@" %@ %lu %lu %@", [NSDate date], (unsigned long)category, level, message]; }]; RLMLogger.defaultLogger = logger; @@ -2984,7 +2984,7 @@ - (void)testDefaultLogger { __block NSMutableString *logs = [[NSMutableString alloc] init]; RLMLogCategory category = RLMLogCategoryRealm; RLMLogger *logger = [[RLMLogger alloc] initWithLogFunction:^(RLMLogLevel level, RLMLogCategory category, NSString *message) { - [logs appendFormat:@" %@ %lu %@", [NSDate date], level, message]; + [logs appendFormat:@" %@ %lu %lu %@", [NSDate date], (unsigned long)category, level, message]; }]; RLMLogger.defaultLogger = logger; [RLMLogger setLevel:RLMLogLevelOff forCategory:category]; @@ -3010,7 +3010,7 @@ - (void)testDefaultLogger { [logs setString: @""]; // Init Custom Logger RLMLogger.defaultLogger = [[RLMLogger alloc] initWithLogFunction:^(RLMLogLevel level, RLMLogCategory category, NSString * message) { - [logs appendFormat:@" %@ %lu %@", [NSDate date], level, message]; + [logs appendFormat:@" %@ %lu %lu %@", [NSDate date], (unsigned long)category, level, message]; }]; [RLMLogger setLevel:RLMLogLevelDebug forCategory:category]; XCTAssertEqual([RLMLogger levelForCategory:category], RLMLogLevelDebug); @@ -3023,9 +3023,10 @@ - (void)testCustomLoggerLogMessage { __block NSMutableString *logs = [[NSMutableString alloc] init]; RLMLogCategory category = RLMLogCategoryRealm; RLMLogger *logger = [[RLMLogger alloc] initWithLogFunction:^(RLMLogLevel level, RLMLogCategory category, NSString * message) { - [logs appendFormat:@" %@ %lu %@.", [NSDate date], level, message]; + [logs appendFormat:@" %@ %lu %lu %@", [NSDate date], (unsigned long)category, level, message]; }]; RLMLogger.defaultLogger = logger; + [RLMLogger setLevel:RLMLogLevelDebug forCategory:category]; [logger logWithLevel:RLMLogLevelInfo message:@"%@ IMPORTANT INFO %i", @"TEST:", 0]; [logger logWithLevel:RLMLogLevelTrace message:@"IMPORTANT TRACE"]; @@ -3058,9 +3059,10 @@ - (void)testSyncConnectionMetrics { __block NSMutableString *logs = [[NSMutableString alloc] init]; RLMLogCategory category = RLMLogCategoryRealm; RLMLogger *logger = [[RLMLogger alloc] initWithLogFunction:^(RLMLogLevel level, RLMLogCategory category, NSString * message) { - [logs appendFormat:@" %@ %lu %@.", [NSDate date], level, message]; + [logs appendFormat:@" %@ %lu %lu %@", [NSDate date], (unsigned long)category, level, message]; }]; RLMLogger.defaultLogger = logger; + [RLMLogger setLevel:RLMLogLevelAll forCategory:category]; RLMApp *app = [RLMApp appWithId:@"test-id"]; // We don't even need the login to succeed, we only want for the logger // to log the values on device info after trying to login. diff --git a/RealmSwift/Tests/RealmTests.swift b/RealmSwift/Tests/RealmTests.swift index abce0828bf..8c6ee25de3 100644 --- a/RealmSwift/Tests/RealmTests.swift +++ b/RealmSwift/Tests/RealmTests.swift @@ -2164,15 +2164,15 @@ class LoggerTests: TestCase, @unchecked Sendable { Logger.setLogLevel(.off, for: Category.realm) Logger.setLogLevel(.info, for: Category.Storage.all) - logger.log(level: .info, category: Category.Storage.all, message: "Storage test entry") + logger.log(with: .info, categoryName: Category.Storage.all.rawValue, message: "Storage test entry") XCTAssertTrue(logs.value.contains("Storage test entry")) logs.wrappedValue = "" - logger.log(level: .info, category: Category.Storage.transaction, message: "Transaction test entry") + logger.log(with: .info, categoryName: Category.Storage.transaction.rawValue, message: "Transaction test entry") XCTAssertTrue(logs.value.contains("Transaction test entry")) logs.wrappedValue = "" - logger.log(level: .info, category: Category.realm, message: "REALM test entry") + logger.log(with: .info, categoryName: Category.realm.rawValue, message: "REALM test entry") XCTAssertFalse(logs.value.contains("REALM test entry")) }