2 commits - kolabformat/errorhandler.cpp

[Christian Mollekopf]

 kolabformat/errorhandler.cpp |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 30c5f9659fa32a96efc2fee98f1d109e06075443
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Tue Jul 31 22:34:50 2012 +0200

    Made the logging threadsafe

diff --git a/kolabformat/errorhandler.cpp b/kolabformat/errorhandler.cpp
index d091ff0..110486e 100644
--- a/kolabformat/errorhandler.cpp
+++ b/kolabformat/errorhandler.cpp
@@ -21,11 +21,14 @@
 #include <qdebug.h>
 #include <QTime>
 #include <QStringList>
+#include <qmutex.h>
 #include <iostream>
 
 #include <kolabformat.h>
 
 namespace Kolab {
+
+QMutex mutex;
     
 void logMessage(const QString &message, const QString &file, int line, ErrorHandler::Severity s)
 {
@@ -35,6 +38,7 @@ void logMessage(const QString &message, const QString &file, int line, ErrorHand
 
 void ErrorHandler::addError(ErrorHandler::Severity s, const QString& message, const QString &location)
 {
+    QMutexLocker locker(&mutex);
     QString filename = location;
     if (!filename.split(QLatin1Char('/')).isEmpty()) {
        filename = filename.split(QLatin1Char('/')).last();
@@ -53,21 +57,25 @@ void ErrorHandler::addError(ErrorHandler::Severity s, const QString& message, co
 
 ErrorHandler::Severity ErrorHandler::error() const
 {
+    QMutexLocker locker(&mutex);
     return m_worstError;
 }
 
 QString ErrorHandler::errorMessage() const
 {
+    QMutexLocker locker(&mutex);
     return m_worstErrorMessage;
 }
 
 const QList< ErrorHandler::Err >& ErrorHandler::getErrors() const
 {
+    QMutexLocker locker(&mutex);
     return m_errorQueue;
 }
 
 void ErrorHandler::clear()
 {
+    QMutexLocker locker(&mutex);
     m_errorQueue.clear();
     m_worstError = Debug;
 }


commit f4d11a33244cf49ade5abba34a6b899f75699bf0
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Tue Jul 31 22:10:42 2012 +0200

    Nicer debug message formatting

diff --git a/kolabformat/errorhandler.cpp b/kolabformat/errorhandler.cpp
index 630135a..d091ff0 100644
--- a/kolabformat/errorhandler.cpp
+++ b/kolabformat/errorhandler.cpp
@@ -39,7 +39,7 @@ void ErrorHandler::addError(ErrorHandler::Severity s, const QString& message, co
     if (!filename.split(QLatin1Char('/')).isEmpty()) {
        filename = filename.split(QLatin1Char('/')).last();
     }
-    const QString output = filename + QTime::currentTime().toString(QLatin1String("(hh:mm:ss)")) + QLatin1String(": ") + message;
+    const QString output = QTime::currentTime().toString(QLatin1String("(hh:mm:ss) ")) + filename + QLatin1String(":\t") + message;
     std::cout << output.toStdString() << std::endl;
     if (s == Debug) {
         return;