X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fcore.cpp;h=b0c02c12c75858b45b6010dd4ed7fca4c8d09531;hb=8f92b3f08df9f4eb8fd243ccec6aa9d4b563ec23;hp=9f9e1c6a5a5e22bbe8614d0c7b8f1516bcb62bd5;hpb=8c6448c2e0048389fbac9e2e9daf22b5b050d5b6;p=quassel.git diff --git a/src/core/core.cpp b/src/core/core.cpp index 9f9e1c6a..b0c02c12 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -187,7 +187,9 @@ void Core::init() qInfo() << "Core is currently not configured! Please connect with a Quassel Client for basic setup."; } } - else { + + // This checks separately because config-from-environment might have only configured the core just now + if (_configured) { if (Quassel::isOptionSet("add-user")) { bool success = createUser(); throw ExitException{success ? EXIT_SUCCESS : EXIT_FAILURE}; @@ -211,6 +213,14 @@ void Core::init() _identServer = new IdentServer(this); } + if (Quassel::isOptionSet("metrics-daemon")) { + _metricsServer = new MetricsServer(this); +#ifdef HAVE_SSL + _server.setMetricsServer(_metricsServer); + _v6server.setMetricsServer(_metricsServer); +#endif + } + Quassel::registerReloadHandler([]() { // Currently, only reloading SSL certificates and the sysident cache is supported if (Core::instance()) { @@ -672,6 +682,10 @@ bool Core::startListening() _identServer->startListening(); } + if (_metricsServer) { + _metricsServer->startListening(); + } + return success; } @@ -681,6 +695,10 @@ void Core::stopListening(const QString& reason) _identServer->stopListening(reason); } + if (_metricsServer) { + _metricsServer->stopListening(reason); + } + bool wasListening = false; if (_server.isListening()) { wasListening = true;