X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.cpp;h=7426f1773a2e29b5abd462c33308a43e39d31a09;hp=3d8b15967a4b7b1a80b05da40ca0b56da367cef7;hb=d682289cc69fac3a5776ef29059cc1f54d8d37d4;hpb=10f9c27ee5d92ece2931947cd341c7f7b548f580

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index 3d8b1596..7426f177 100644
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,69 +15,103 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "coreapplication.h"
 
 #include "core.h"
+#include "logger.h"
 
 CoreApplicationInternal::CoreApplicationInternal()
-  : _coreCreated(false)
+    : _coreCreated(false)
 {
-  Q_INIT_RESOURCE(sql);
-
-  // put core-only arguments here
-  CliParser *parser = Quassel::cliParser();
-  parser->addOption("port",'p', tr("The port quasselcore will listen at"), QString("4242"));
-  parser->addSwitch("norestore", 'n', tr("Don't restore last core's state"));
-  parser->addOption("logfile", 'l', tr("Path to logfile"));
-  parser->addOption("loglevel", 'L', tr("Loglevel Debug|Info|Warning|Error"), "Info");
-  parser->addOption("datadir", 0, tr("Specify the directory holding datafiles like the Sqlite DB and the SSL Cert"));
 }
 
-CoreApplicationInternal::~CoreApplicationInternal() {
-  if(_coreCreated) {
-    Core::saveState();
-    Core::destroy();
-  }
+
+CoreApplicationInternal::~CoreApplicationInternal()
+{
+    if (_coreCreated) {
+        Core::saveState();
+        Core::destroy();
+    }
 }
 
-bool CoreApplicationInternal::init() {
-  /* FIXME
-  This is an initial check if logfile is writable since the warning would spam stdout if done
-  in current Logger implementation. Can be dropped whenever the logfile is only opened once.
-  */
-  QFile logFile;
-  if(!Quassel::optionValue("logfile").isEmpty()) {
-    logFile.setFileName(Quassel::optionValue("logfile"));
-    if(!logFile.open(QIODevice::Append | QIODevice::Text))
-      qWarning("Warning: Couldn't open logfile '%s' - will log to stdout instead",qPrintable(logFile.fileName()));
-    else logFile.close();
-  }
-
-  Core::instance();  // create and init the core
-  _coreCreated = true;
-
-  if(!Quassel::isOptionSet("norestore")) {
-    Core::restoreState();
-  }
-  return true;
+
+bool CoreApplicationInternal::init()
+{
+    /* FIXME
+    This is an initial check if logfile is writable since the warning would spam stdout if done
+    in current Logger implementation. Can be dropped whenever the logfile is only opened once.
+    */
+    QFile logFile;
+    if (!Quassel::optionValue("logfile").isEmpty()) {
+        logFile.setFileName(Quassel::optionValue("logfile"));
+        if (!logFile.open(QIODevice::Append | QIODevice::Text))
+            qWarning("Warning: Couldn't open logfile '%s' - will log to stdout instead", qPrintable(logFile.fileName()));
+        else logFile.close();
+    }
+
+    Core::instance(); // create and init the core
+    _coreCreated = true;
+
+    if (!Quassel::isOptionSet("norestore"))
+        Core::restoreState();
+
+    return true;
+}
+
+
+bool CoreApplicationInternal::reloadConfig()
+{
+    if (_coreCreated) {
+        // Currently, only reloading SSL certificates is supported
+        return Core::reloadCerts();
+    } else {
+        return false;
+    }
 }
 
+
 /*****************************************************************************/
 
-CoreApplication::CoreApplication(int &argc, char **argv) : QCoreApplication(argc, argv), Quassel() {
-  setRunMode(Quassel::CoreOnly);
-  _internal = new CoreApplicationInternal();
+CoreApplication::CoreApplication(int &argc, char **argv)
+    : QCoreApplication(argc, argv), Quassel()
+{
+#ifdef Q_OS_MAC
+    disableCrashhandler();
+#endif /* Q_OS_MAC */
+
+    setRunMode(Quassel::CoreOnly);
+    _internal = new CoreApplicationInternal();
 }
 
-CoreApplication::~CoreApplication() {
-  delete _internal;
+
+CoreApplication::~CoreApplication()
+{
+    delete _internal;
 }
 
-bool CoreApplication::init() {
-  if(Quassel::init())
-    return _internal->init();
-  return false;
+
+bool CoreApplication::init()
+{
+    if (Quassel::init() && _internal->init()) {
+#if QT_VERSION < 0x050000
+        qInstallMsgHandler(Logger::logMessage);
+#else
+        qInstallMessageHandler(Logger::logMessage);
+#endif
+        return true;
+    }
+    return false;
+}
+
+
+bool CoreApplication::reloadConfig()
+{
+    if (_internal) {
+        return _internal->reloadConfig();
+    } else {
+        return false;
+    }
 }