Don't flush ddlog when flushing stdout or stderr stream redirector

monal-im · Jan 4, 2025 · 664d3a0 · 664d3a0
1 parent a73022d
commit 664d3a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/Monal/Classes/MLStreamRedirect.m b/Monal/Classes/MLStreamRedirect.m
@@ -142,7 +142,6 @@ -(void) flushWithWaitBlock:(monal_void_block_t) waitBlock
     DDLogVerbose(@"Waiting for flush of fd %d to complete...", fileno(self->_stream));
     waitBlock();
     DDLogVerbose(@"Flush on fd %d completed...", fileno(self->_stream));
-    [DDLog flushLog];
 }
 
 -(void) flushAndCloseWithWaitBlock:(monal_void_block_t) waitBlock
@@ -163,7 +162,6 @@ -(void) flushAndCloseWithWaitBlock:(monal_void_block_t) waitBlock
 
     //wait for this eof signal and flush our DDLog afterwards to make sure everything reached the log sinks
     waitBlock();
-    [DDLog flushLog];
 }
 
 -(void) signalFlushCompleted

diff --git a/Monal/Classes/MonalAppDelegate.m b/Monal/Classes/MonalAppDelegate.m
@@ -1260,6 +1260,7 @@ -(void) applicationWillTerminate:(UIApplication *)application
         DDLogInfo(@"|~~| T E R M I N A T E D |~~|");
         [DDLog flushLog];
         [HelperTools flushLogsWithTimeout:0.025];
+        [DDLog flushLog];
     }
 }
 
@@ -1421,7 +1422,6 @@ -(void) checkIfBackgroundTaskIsStillNeeded
             if(background)
             {
                 DDLogInfo(@"### All accounts idle, disconnecting and stopping all background tasks ###");
-                [DDLog flushLog];
                 DDLogVerbose(@"Setting _shutdownPending to YES...");
                 _shutdownPending = YES;
                 [HelperTools scheduleBackgroundTask:NO];            //request bg fetch execution in BGFETCH_DEFAULT_INTERVAL seconds
@@ -1464,7 +1464,7 @@ -(void) checkIfBackgroundTaskIsStillNeeded
                     }
                     if(!stopped)
                     {
-                        DDLogDebug(@"no background tasks running, nothing to stop");
+                        DDLogError(@"no background tasks running, nothing to stop");
                         [DDLog flushLog];
                     }
                     else