/***************************************************************************
- * Copyright (C) 2005-2016 by the Quassel Project *
+ * Copyright (C) 2005-2018 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "coreapplication.h"
-
#include "core.h"
-#include "logger.h"
+#include "coreapplication.h"
CoreApplicationInternal::CoreApplicationInternal()
: _coreCreated(false)
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;
Quassel::registerReloadHandler([]() {
- // Currently, only reloading SSL certificates is supported
+ // Currently, only reloading SSL certificates and the sysident cache is supported
+ Core::cacheSysIdent();
return Core::reloadCerts();
});
CoreApplication::~CoreApplication()
{
delete _internal;
+ Quassel::destroy();
}
bool CoreApplication::init()
{
- if (Quassel::init() && _internal->init()) {
-#if QT_VERSION < 0x050000
- qInstallMsgHandler(Logger::logMessage);
-#else
- qInstallMessageHandler(Logger::logMessage);
-#endif
- return true;
- }
- return false;
+ return Quassel::init() && _internal->init();
}