changed way feature flag worked

radarlabs · Dec 11, 2023 · 40ecb97 · 40ecb97
1 parent 81e1404
commit 40ecb97
Showing 1 changed file with 20 additions and 23 deletions.
diff --git a/RadarSDK/RadarLogBuffer.m b/RadarSDK/RadarLogBuffer.m
@@ -21,6 +21,7 @@
 
 @implementation RadarLogBuffer {
     NSMutableArray<RadarLog *> *mutableLogBuffer;
+    NSMutableArray<RadarLog *> *inMemoryLogBuffer;
     BOOL useLogPersistence;
 }
 
@@ -30,6 +31,7 @@ - (instancetype)init {
         RadarFeatureSettings *featureSettings = [RadarSettings featureSettings];
         useLogPersistence = featureSettings.useLogPersistence;
         mutableLogBuffer = [NSMutableArray<RadarLog *> new];
+        inMemoryLogBuffer = [NSMutableArray<RadarLog *> new];
         if (useLogPersistence) {
             NSString *documentsDirectory = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).firstObject;
             self.logFileDir = [documentsDirectory stringByAppendingPathComponent:@"radar_logs"];
@@ -54,32 +56,31 @@ + (instancetype)sharedInstance {
 
 - (void)write:(RadarLogLevel)level type:(RadarLogType)type message:(NSString *)message {
     @synchronized (self) {
+        NSUInteger logLength = [mutableLogBuffer count];
+        if (logLength >= MAX_BUFFER_SIZE) {
+            [self purgeOldestLogs];
+        }
+        // add new log to buffer
+        RadarLog *radarLog = [[RadarLog alloc] initWithLevel:level type:type message:message];
+        [mutableLogBuffer addObject:radarLog];
+
         if (useLogPersistence) {
             RadarLog *radarLog = [[RadarLog alloc] initWithLevel:level type:type message:message];
-            [mutableLogBuffer addObject:radarLog];
-            NSUInteger logLength = [mutableLogBuffer count];
+            [inMemoryLogBuffer addObject:radarLog];
+            NSUInteger logLength = [inMemoryLogBuffer count];
             if (logLength >= MAX_MEMORY_BUFFER_SIZE) {
                 [self persistLogs];
             }
-        }
-        else {
-            NSUInteger logLength = [mutableLogBuffer count];
-            if (logLength >= MAX_BUFFER_SIZE) {
-                [self purgeOldestLogs];
-            }
-            // add new log to buffer
-            RadarLog *radarLog = [[RadarLog alloc] initWithLevel:level type:type message:message];
-            [mutableLogBuffer addObject:radarLog];
-        } 
+        }    
     }
 }
 
 - (void)persistLogs {
     @synchronized (self) {
         if (useLogPersistence) {
-            NSArray *flushableLogs = [mutableLogBuffer copy];
+            NSArray *flushableLogs = [inMemoryLogBuffer copy];
             [self addLogsToBuffer:flushableLogs];
-            [mutableLogBuffer removeAllObjects]; 
+            [inMemoryLogBuffer removeAllObjects]; 
         }
     }
 }
@@ -115,12 +116,10 @@ - (void)writeToFileStorage:(NSArray <RadarLog *> *)logs {
 
 - (void)append:(RadarLogLevel)level type:(RadarLogType)type message:(NSString *)message {
     @synchronized (self) {
+        [self write:level type:type message:message];
         if (useLogPersistence){
             [self writeToFileStorage:@[[[RadarLog alloc] initWithLevel:level type:type message:message]]];
         }
-        else {
-            [self write:level type:type message:message];
-        }
     }
 }
 
@@ -147,6 +146,7 @@ - (void)purgeOldestLogs {
 
 - (void)removeLogsFromBuffer:(NSUInteger)numLogs {
     @synchronized (self) {
+        [mutableLogBuffer removeObjectsInRange:NSMakeRange(0, numLogs)];
         if (useLogPersistence) {
              NSArray<NSString *> *files = [self.fileHandler allFilesInDirectory:self.logFileDir];
             numLogs = MIN(numLogs, [files count]);
@@ -155,14 +155,13 @@ - (void)removeLogsFromBuffer:(NSUInteger)numLogs {
                 NSString *filePath = [self.logFileDir stringByAppendingPathComponent:file];
                 [self.fileHandler deleteFileAtPath:filePath];
             }
-        } else {
-            [mutableLogBuffer removeObjectsInRange:NSMakeRange(0, numLogs)];
         }
     }
 }
 
 - (void)addLogsToBuffer:(NSArray<RadarLog *> *)logs {
     @synchronized (self) {
+        [mutableLogBuffer addObjectsFromArray:logs];
         if (useLogPersistence) {
             NSArray<NSString *> *files = [self.fileHandler allFilesInDirectory:self.logFileDir];
             NSUInteger bufferSize = [files count];
@@ -176,16 +175,14 @@ - (void)addLogsToBuffer:(NSArray<RadarLog *> *)logs {
                 [self writeToFileStorage:@[purgeLog]];
             }
             [self writeToFileStorage:logs];
-        } else {
-            [mutableLogBuffer addObjectsFromArray:logs];
-        }
+        } 
     }
 }
 
 //for use in testing
 -(void)clearBuffer {
     @synchronized (self) {
-        [mutableLogBuffer removeAllObjects];
+        [inMemoryLogBuffer removeAllObjects];
         NSArray<NSString *> *files = [self.fileHandler allFilesInDirectory:self.logFileDir];
         if (files) {
             for (NSString *file in files) {