X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fquassel.cpp;h=5ceddb101eef6c8d48e9bf23bb8430fa19d5d753;hp=67eac802fd1f7023f14d42bdf3b8ee1b070e1864;hb=74226102118400b228618f7373137a4a01e7d85f;hpb=fa56ee7fc1b94ea27da6b27c919d6df1c0e0490d

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index 67eac802..5ceddb10 100644
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -44,6 +44,7 @@
 #include "bufferinfo.h"
 #include "identity.h"
 #include "logger.h"
+#include "logmessage.h"
 #include "message.h"
 #include "network.h"
 #include "peer.h"
@@ -61,7 +62,19 @@ Quassel *Quassel::instance()
 
 
 Quassel::Quassel()
+    : _logger{new Logger{this}}
 {
+}
+
+
+bool Quassel::init()
+{
+    if (instance()->_initialized)
+        return true;  // allow multiple invocations because of MonolithicApplication
+
+    // Setup signal handling
+    // TODO: Don't use unsafe methods, see handleSignal()
+
     // We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel.
     signal(SIGTERM, handleSignal);
     signal(SIGINT, handleSignal);
@@ -70,13 +83,6 @@ Quassel::Quassel()
     // Windows does not support SIGHUP
     signal(SIGHUP, handleSignal);
 #endif
-}
-
-
-bool Quassel::init()
-{
-    if (instance()->_initialized)
-        return true;  // allow multiple invocations because of MonolithicApplication
 
     if (instance()->_handleCrashes) {
         // we have crashhandler for win32 and unix (based on execinfo).
@@ -88,12 +94,12 @@ bool Quassel::init()
 
         if (rc == -1 || !((long)limit->rlim_cur > 0 || limit->rlim_cur == RLIM_INFINITY)) {
 # endif /* Q_OS_WIN */
-        signal(SIGABRT, handleSignal);
-        signal(SIGSEGV, handleSignal);
+            signal(SIGABRT, handleSignal);
+            signal(SIGSEGV, handleSignal);
 # ifndef Q_OS_WIN
-        signal(SIGBUS, handleSignal);
-    }
-    free(limit);
+            signal(SIGBUS, handleSignal);
+        }
+        free(limit);
 # endif /* Q_OS_WIN */
 #endif /* Q_OS_WIN || HAVE_EXECINFO */
     }
@@ -118,52 +124,19 @@ bool Quassel::init()
         return false;
     }
 
-    // Set up logging
-    if (isOptionSet("loglevel")) {
-        QString level = optionValue("loglevel").toLower();
-
-        if (level == "debug")
-            setLogLevel(DebugLevel);
-        else if (level == "info")
-            setLogLevel(InfoLevel);
-        else if (level == "warning")
-            setLogLevel(WarningLevel);
-        else if (level == "error")
-            setLogLevel(ErrorLevel);
-        else {
-            qWarning() << qPrintable(tr("Invalid log level %1; supported are Debug|Info|Warning|Error").arg(level));
-            return false;
-        }
-    }
-
-    QString logfilename = optionValue("logfile");
-    if (!logfilename.isEmpty()) {
-        instance()->_logFile.reset(new QFile{logfilename});
-        if (!logFile()->open(QIODevice::Append | QIODevice::Text)) {
-            qWarning() << qPrintable(tr("Could not open log file \"%1\": %2").arg(logfilename, logFile()->errorString()));
-            instance()->_logFile.reset();
-        }
-    }
-#ifdef HAVE_SYSLOG
-    instance()->_logToSyslog = isOptionSet("syslog");
-#endif
+    // Don't keep a debug log on the core
+    return instance()->logger()->setup(runMode() != RunMode::CoreOnly);
+}
 
-#if QT_VERSION < 0x050000
-    qInstallMsgHandler(Logger::logMessage);
-#else
-    qInstallMessageHandler(Logger::logMessage);
-#endif
 
-    return true;
+void Quassel::destroy()
+{
 }
 
 
-void Quassel::destroy()
+Logger *Quassel::logger() const
 {
-    if (logFile()) {
-        logFile()->close();
-        instance()->_logFile.reset();
-    }
+    return _logger;
 }
 
 
@@ -356,6 +329,8 @@ const Quassel::BuildInfo &Quassel::buildInfo()
 
 
 //! Signal handler for graceful shutdown.
+//! @todo: Ensure this doesn't use unsafe methods (it does currently)
+//!        cf. QSocketNotifier, UnixSignalWatcher
 void Quassel::handleSignal(int sig)
 {
     switch (sig) {
@@ -423,45 +398,6 @@ bool Quassel::isOptionSet(const QString &key)
 }
 
 
-Quassel::LogLevel Quassel::logLevel()
-{
-    return instance()->_logLevel;
-}
-
-
-void Quassel::setLogLevel(LogLevel logLevel)
-{
-    instance()->_logLevel = logLevel;
-}
-
-
-QFile *Quassel::logFile() {
-    return instance()->_logFile.get();
-}
-
-
-bool Quassel::logToSyslog()
-{
-    return instance()->_logToSyslog;
-}
-
-
-void Quassel::logFatalMessage(const char *msg)
-{
-#ifdef Q_OS_MAC
-    Q_UNUSED(msg)
-#else
-    QFile dumpFile(instance()->coreDumpFileName());
-    dumpFile.open(QIODevice::Append);
-    QTextStream dumpStream(&dumpFile);
-
-    dumpStream << "Fatal: " << msg << '\n';
-    dumpStream.flush();
-    dumpFile.close();
-#endif
-}
-
-
 const QString &Quassel::coreDumpFileName()
 {
     if (_coreDumpFileName.isEmpty()) {