From a5d784448931d05caf2859250807e4fa753637fe Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwelk@xhochy.com>
Date: Fri, 22 Aug 2014 10:46:44 +0100
Subject: [PATCH] Do not use locales on shutdown

---
 src/libtomahawk/utils/Logger.cpp | 50 +++++++++++++++++++++++++++-----
 src/libtomahawk/utils/Logger.h   |  1 +
 src/tests/TestDatabase.h         | 15 ++++++++--
 src/tomahawk/TomahawkApp.cpp     |  3 ++
 4 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/src/libtomahawk/utils/Logger.cpp b/src/libtomahawk/utils/Logger.cpp
index 9df870a16..5aaccf0d5 100644
--- a/src/libtomahawk/utils/Logger.cpp
+++ b/src/libtomahawk/utils/Logger.cpp
@@ -41,6 +41,7 @@ using namespace std;
 ofstream logfile;
 static int s_threshold = -1;
 QMutex s_mutex;
+bool shutdownInProgress = false;
 
 namespace Logger
 {
@@ -77,11 +78,26 @@ log( const char *msg, unsigned int debugLevel, bool toDisk = true )
             logfile << "TSQLQUERY: ";
         #endif
 
-        logfile << QDate::currentDate().toString().toUtf8().data()
-                << " - "
-                << QTime::currentTime().toString().toUtf8().data()
-                << " [" << QString::number( debugLevel ).toUtf8().data() << "]: "
-                << msg << endl;
+        if ( shutdownInProgress )
+        {
+            // Do not use locales anymore in shutdown
+            logfile << QDate::currentDate().day() << "."
+                    << QDate::currentDate().month() << "."
+                    << QDate::currentDate().year() << " - "
+                    << QTime::currentTime().hour() << ":"
+                    << QTime::currentTime().minute() << ":"
+                    << QTime::currentTime().second()
+                    << " [" << QString::number( debugLevel ).toUtf8().data() << "]: "
+                    << msg << endl;
+        }
+        else
+        {
+            logfile << QDate::currentDate().toString().toUtf8().data()
+                    << " - "
+                    << QTime::currentTime().toString().toUtf8().data()
+                    << " [" << QString::number( debugLevel ).toUtf8().data() << "]: "
+                    << msg << endl;
+        }
 
         logfile.flush();
     }
@@ -90,9 +106,20 @@ log( const char *msg, unsigned int debugLevel, bool toDisk = true )
     {
         QMutexLocker lock( &s_mutex );
 
-        cout << QTime::currentTime().toString().toUtf8().data()
-             << " [" << QString::number( debugLevel ).toUtf8().data() << "]: "
-             << msg << endl;
+        if ( shutdownInProgress )
+        {
+            cout << QTime::currentTime().hour() << ":"
+                 << QTime::currentTime().minute() << ":"
+                 << QTime::currentTime().second()
+                 << " [" << QString::number( debugLevel ).toUtf8().data() << "]: "
+                 << msg << endl;
+        }
+        else
+        {
+            cout << QTime::currentTime().toString().toUtf8().data()
+                 << " [" << QString::number( debugLevel ).toUtf8().data() << "]: "
+                 << msg << endl;
+        }
 
         cout.flush();
     }
@@ -191,3 +218,10 @@ TLog::~TLog()
     log( m_msg.toUtf8().data(), m_debugLevel );
 }
 
+
+void
+tLogNotifyShutdown()
+{
+    QMutexLocker locker( &s_mutex );
+    shutdownInProgress = true;
+}
diff --git a/src/libtomahawk/utils/Logger.h b/src/libtomahawk/utils/Logger.h
index 548329e8c..34916a515 100644
--- a/src/libtomahawk/utils/Logger.h
+++ b/src/libtomahawk/utils/Logger.h
@@ -67,5 +67,6 @@ namespace Logger
 #define tLog Logger::TLog
 #define tDebug Logger::TDebug
 #define tSqlLog Logger::TSqlLog
+DLLEXPORT void tLogNotifyShutdown();
 
 #endif // TOMAHAWK_LOGGER_H
diff --git a/src/tests/TestDatabase.h b/src/tests/TestDatabase.h
index 13af6e44e..53b907ef5 100644
--- a/src/tests/TestDatabase.h
+++ b/src/tests/TestDatabase.h
@@ -34,11 +34,22 @@ Q_OBJECT
 class TestDatabase : public QObject
 {
     Q_OBJECT
+private:
+    Tomahawk::Database* db;
 
 private slots:
+    void initTestCase()
+    {
+        db = new Tomahawk::Database("test");
+    }
+
+    void cleanupTestCase()
+    {
+        delete db;
+    }
+
     void testFactories()
     {
-        Tomahawk::Database* db = new Tomahawk::Database("test");
         Tomahawk::dbcmd_ptr command;
 
         // can we check that his ASSERTs?, it's a build in type, one must not register it again
@@ -61,8 +72,6 @@ private slots:
         command = db->commandFactory<TestDatabaseCommand>()->newInstance();
         TestDatabaseCommand* tCmd = qobject_cast< TestDatabaseCommand* >( command.data() );
         QVERIFY( tCmd );
-
-        delete db;
     }
 };
 
diff --git a/src/tomahawk/TomahawkApp.cpp b/src/tomahawk/TomahawkApp.cpp
index fe9d394fd..d28c72e1b 100644
--- a/src/tomahawk/TomahawkApp.cpp
+++ b/src/tomahawk/TomahawkApp.cpp
@@ -287,6 +287,9 @@ TomahawkApp::~TomahawkApp()
 {
     tDebug( LOGVERBOSE ) << "Shutting down Tomahawk...";
 
+    // Notify Logger that we are shutting down so we skip the locale
+    tLogNotifyShutdown();
+
     if ( Pipeline::instance() )
         Pipeline::instance()->stop();