- don't open/close log file for each message, instead provide a "reopen" slot

- hide QXmppLogger's internals in a private class

2 files changed, 67 insertions, 20 deletions

diff --git a/src/QXmppLogger.cpp b/src/QXmppLogger.cpp
index a9d149ba..107f72d9 100644
--- a/src/QXmppLogger.cpp
+++ b/src/QXmppLogger.cpp
@@ -89,20 +89,47 @@ void QXmppLoggable::childEvent(QChildEvent *event)
     }
 }
 
+class QXmppLoggerPrivate
+{
+public:
+    QXmppLoggerPrivate(QXmppLogger *qq);
+
+    QXmppLogger::LoggingType loggingType;
+    QFile *logFile;
+    QString logFilePath;
+    QXmppLogger::MessageTypes messageTypes;
+
+private:
+    QXmppLogger *q;
+};
+
+QXmppLoggerPrivate::QXmppLoggerPrivate(QXmppLogger *qq)
+    : loggingType(QXmppLogger::NoLogging),
+    logFile(0),
+    logFilePath("QXmppClientLog.log"),
+    messageTypes(QXmppLogger::AnyMessage),
+    q(qq)
+{
+}
+
 /// Constructs a new QXmppLogger.
 ///
 /// \param parent
 
 QXmppLogger::QXmppLogger(QObject *parent)
-    : QObject(parent),
-    m_loggingType(QXmppLogger::NoLogging),
-    m_logFilePath("QXmppClientLog.log"),
-    m_messageTypes(QXmppLogger::AnyMessage)
+    : QObject(parent)
 {
+    d = new QXmppLoggerPrivate(this);
+
     // make it possible to pass QXmppLogger::MessageType between threads
     qRegisterMetaType< QXmppLogger::MessageType >("QXmppLogger::MessageType");
 }
 
+QXmppLogger::~QXmppLogger()
+{
+    delete d;
+}
+
 /// Returns the default logger.
 ///
 
@@ -119,7 +146,7 @@ QXmppLogger* QXmppLogger::getLogger()
 
 QXmppLogger::LoggingType QXmppLogger::loggingType()
 {
-    return m_loggingType;
+    return d->loggingType;
 }
 
 /// Sets the handler for logging messages.
@@ -128,7 +155,10 @@ QXmppLogger::LoggingType QXmppLogger::loggingType()
 
 void QXmppLogger::setLoggingType(QXmppLogger::LoggingType type)
 {
-    m_loggingType = type;
+    if (d->loggingType != type) {
+        d->loggingType = type;
+        reopen();
+    }
 }
 
 /// Returns the types of messages to log.
@@ -136,7 +166,7 @@ void QXmppLogger::setLoggingType(QXmppLogger::LoggingType type)
 
 QXmppLogger::MessageTypes QXmppLogger::messageTypes()
 {
-    return m_messageTypes;
+    return d->messageTypes;
 }
 
 /// Sets the types of messages to log.
@@ -145,7 +175,7 @@ QXmppLogger::MessageTypes QXmppLogger::messageTypes()
 
 void QXmppLogger::setMessageTypes(QXmppLogger::MessageTypes types)
 {
-    m_messageTypes = types;
+    d->messageTypes = types;
 }
 
 /// Add a logging message.
@@ -156,18 +186,17 @@ void QXmppLogger::setMessageTypes(QXmppLogger::MessageTypes types)
 void QXmppLogger::log(QXmppLogger::MessageType type, const QString& text)
 {
     // filter messages
-    if (!m_messageTypes.testFlag(type))
+    if (!d->messageTypes.testFlag(type))
         return;
 
-    switch(m_loggingType)
+    switch(d->loggingType)
     {
     case QXmppLogger::FileLogging:
-        {
-            QFile file(m_logFilePath);
-            file.open(QIODevice::Append);
-            QTextStream stream(&file);
-            stream << formatted(type, text) << "\n";
+        if (!d->logFile) {
+            d->logFile = new QFile(d->logFilePath);
+            d->logFile->open(QIODevice::WriteOnly | QIODevice::Append);
         }
+        QTextStream(d->logFile) << formatted(type, text) << "\n";
         break;
     case QXmppLogger::StdoutLogging:
         std::cout << qPrintable(formatted(type, text)) << std::endl;
@@ -186,7 +215,7 @@ void QXmppLogger::log(QXmppLogger::MessageType type, const QString& text)
 
 QString QXmppLogger::logFilePath()
 {
-    return m_logFilePath;
+    return d->logFilePath;
 }
 
 /// Sets the path to which logging messages should be written.
@@ -197,6 +226,20 @@ QString QXmppLogger::logFilePath()
 
 void QXmppLogger::setLogFilePath(const QString &path)
 {
-    m_logFilePath = path;
+    if (d->logFilePath != path) {
+        d->logFilePath = path;
+        reopen();
+    }
+}
+
+/// If logging to a file, causes the file to be re-opened.
+///
+
+void QXmppLogger::reopen()
+{
+    if (d->logFile) {
+        delete d->logFile;
+        d->logFile = 0;
+    }
 }
 
diff --git a/src/QXmppLogger.h b/src/QXmppLogger.h
index 6ca98755..93de33f7 100644
--- a/src/QXmppLogger.h
+++ b/src/QXmppLogger.h
@@ -3,6 +3,7 @@
  *
  * Author:
  *  Manjeet Dahiya
+ *  Jeremy Lainé
  *
  * Source:
  *  http://code.google.com/p/qxmpp
@@ -33,6 +34,8 @@
 #define qxmpp_loggable_trace(x) (x)
 #endif
 
+class QXmppLoggerPrivate;
+
 /// \brief The QXmppLogger class represents a sink for logging messages.
 ///
 /// \ingroup Core
@@ -70,6 +73,8 @@ public:
     Q_DECLARE_FLAGS(MessageTypes, MessageType)
 
     QXmppLogger(QObject *parent = 0);
+    ~QXmppLogger();
+
     static QXmppLogger* getLogger();
 
     QXmppLogger::LoggingType loggingType();
@@ -83,6 +88,7 @@ public:
 
 public slots:
     void log(QXmppLogger::MessageType type, const QString& text);
+    void reopen();
 
 signals:
     /// This signal is emitted whenever a log message is received.
@@ -90,9 +96,7 @@ signals:
 
 private:
     static QXmppLogger* m_logger;
-    QXmppLogger::LoggingType m_loggingType;
-    QString m_logFilePath;
-    QXmppLogger::MessageTypes m_messageTypes;
+    QXmppLoggerPrivate *d;
 };
 
 /// \brief The QXmppLoggable class represents a source of logging messages.