[Logger] Ensure log file is flushed before crash

diff --git a/src/libsync/logger.cpp b/src/libsync/logger.cpp
index fade2084bd559f2c815ee20a15fe0fd5e400d24a..ba9f2fd877ead016ea554c542823828c39d0707f 100644 (file)
--- a/src/libsync/logger.cpp
+++ b/src/libsync/logger.cpp
@@ -47,12 +47,15 @@ static void mirallLogCatcher(QtMsgType type, const QMessageLogContext &ctx, cons
         std::cerr << qPrintable(qFormatLogMessage(type, ctx, message)) << std::endl;
     }
 
+    if(type == QtFatalMsg) {
+        if (!logger->isNoop()) {
+            logger->close();
+        }
 #if defined(Q_OS_WIN)
     // Make application terminate in a way that can be caught by the crash reporter
-    if(type == QtFatalMsg) {
         Utility::crash();
-    }
 #endif
+    }
 }
 
 
@@ -138,6 +141,17 @@ void Logger::doLog(const QString &msg)
     emit logWindowLog(msg);
 }
 
+void Logger::close()
+{
+    QMutexLocker lock(&_mutex);
+    if (_logstream)
+    {
+        _logstream->flush();
+        _logFile.close();
+        _logstream.reset();
+    }
+}
+
 void Logger::mirallLog(const QString &message)
 {
     Log log_;

diff --git a/src/libsync/logger.h b/src/libsync/logger.h
index b5742ed4453825050643b236677cec952c6fd5e1..5f32a8a0d8730b724e29e1adf02b6c882c7f3077 100644 (file)
--- a/src/libsync/logger.h
+++ b/src/libsync/logger.h
@@ -47,6 +47,7 @@ public:
 
     void log(Log log);
     void doLog(const QString &log);
+    void close();
 
     static void mirallLog(const QString &message);