Merge pull request markparticle#24 from markparticle/dev_mark

🐛 fix bug
cunhan1009 · Jul 7, 2020 · 8f68ff9 · 8f68ff9
2 parents 152199f + 1debbc0
commit 8f68ff9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/code/log/log.cpp b/code/log/log.cpp
@@ -169,8 +169,13 @@ void Log::AppendLogLevelTitle_(int level) {
 }
 
 void Log::flush(void) {
-    lock_guard<mutex> locker(mtx_);
-    fflush(fp_);
+    {
+        lock_guard<mutex> locker(mtx_);
+        fflush(fp_);
+    }
+    if(isAsync_) { 
+        deque_->flush(); 
+    }
 }
 
 void Log::AsyncWrite_() {

diff --git a/code/log/log.h b/code/log/log.h
@@ -70,7 +70,6 @@ class Log {
         if (log->IsOpen() && log->GetLevel() <= level) {\
             log->write(level, format, ##__VA_ARGS__); \
             log->flush();\
-            if(isAsync_) { deque_->flush(); } \
         }\
     } while(0);