Merge lp:~mandel/ubuntu-download-manager/add-syslog into lp:ubuntu-download-manager

[Manuel de la Peña]

Use syslog when running as a system bus service rather than logging to a file.

Use syslog when running as a system bus service rather than logging to a file.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:138
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mandel/ubuntu-download-manager/add-syslog/+merge/187684/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/88/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-amd64-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-armhf-ci/79

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-download-manager-ci/88/rebuild

review: Needs Fixing (continuous-integration)

[Roberto Alsina (ralsina)]

+1

review: Approve

[Alejandro J. Cura (alecu)]

+1

review: Approve

[lp:~mandel/ubuntu-download-manager/add-syslog]

139. By Manuel de la Peña on 2013-09-27

Add comment to explain why we use %s

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:139
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/93/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-amd64-ci/93
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-armhf-ci/84

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-download-manager-ci/93/rebuild

review: Approve (continuous-integration)

=== modified file 'libubuntudownloadmanager/logger.cpp'
--- libubuntudownloadmanager/logger.cpp	2013-09-23 11:50:04 +0000
+++ libubuntudownloadmanager/logger.cpp	2013-09-27 21:37:04 +0000
@@ -18,6 +18,7 @@
 
 #include <unistd.h>
 #include <sys/types.h>
+#include <syslog.h>
 #include <QDateTime>
 #include <QDir>
 #include <QStandardPaths>
@@ -70,7 +71,8 @@
 
 void
 Logger::openSyslogConnection() {
-    // TODO(mandel): init syslog
+    openlog("ubuntu-download-manager",
+        LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1);
 }
 
 void
@@ -82,7 +84,14 @@
 void
 Logger::stopLogging() {
     if (_logger != NULL) {
-        delete reinterpret_cast<Logger*>(_logger);
+        Logger* log = reinterpret_cast<Logger*>(_logger);
+        if (log->_isSystemBus) {
+            closelog();
+        } else {
+            log->_logFile.close();
+        }
+
+        delete log;
         _logger = NULL;
     }
 }
@@ -125,14 +134,30 @@
 }
 
 void
-Logger::logSessionMessage(const QString &message) {
+Logger::logSessionMessage(const QString& message) {
     _logStream << message;
     _logStream.flush();
 }
 
 void
-Logger::logSystemMessage(const QString &message) {
-    Q_UNUSED(message);
+Logger::logSystemMessage(QtMsgType type, const QString& message) {
+    const char* msg = message.toUtf8().data();
+
+    // we using %s to avoid getting a compiler error when using
+    // -Wall
+    switch (type) {
+        case QtDebugMsg:
+            syslog(LOG_DEBUG, "%s", msg);
+            break;
+        case QtCriticalMsg:
+            syslog(LOG_CRIT, "%s", msg);
+            break;
+        case QtFatalMsg:
+            syslog(LOG_ALERT, "%s", msg);
+            break;
+        default:
+            break;
+    }
 }
 
 void
@@ -163,7 +188,7 @@
     _stdErr.device()->close();
 
     if (_isSystemBus) {
-        logSystemMessage(logMessage);
+        logSystemMessage(type, logMessage);
     } else {
         logSessionMessage(logMessage);
     }

=== modified file 'libubuntudownloadmanager/logger.h'
--- libubuntudownloadmanager/logger.h	2013-09-23 11:50:04 +0000
+++ libubuntudownloadmanager/logger.h	2013-09-27 21:37:04 +0000
@@ -51,7 +51,7 @@
 
     void logSessionMessage(const QString &message);
 
-    void logSystemMessage(const QString &message);
+    void logSystemMessage(QtMsgType type, const QString &message);
 
  private:
     bool _isSystemBus = false;