X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fquassel.cpp;h=3fa1b45eb3cf345746c868f303cc83ef7565ef82;hp=0c6b863036932d14e7eddadefdf674072309dd9b;hb=d06a8048f0c93c7e063031739ad8e606b91a6f6c;hpb=5e25edca8416d89570ebce59096c1e7a93c81352

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index 0c6b8630..3fa1b45e 100644
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -366,6 +366,9 @@ void Quassel::setupCliParser()
             {"require-ssl", tr("Require SSL for remote (non-loopback) client connections.")},
             {"ssl-cert", tr("Specify the path to the SSL certificate."), tr("path"), "configdir/quasselCert.pem"},
             {"ssl-key", tr("Specify the path to the SSL key."), tr("path"), "ssl-cert-path"},
+            {"metrics-daemon", tr("Enable metrics API.")},
+            {"metrics-port", tr("The port quasselcore will listen at for metrics requests. Only meaningful with --metrics-daemon."), tr("port"), "9558"},
+            {"metrics-listen", tr("The address(es) quasselcore will listen on for metrics requests. Same format as --listen."), tr("<address>[,...]"), "::1,127.0.0.1"}
 #endif
         };
     }
@@ -486,7 +489,7 @@ QStringList Quassel::dataDirPaths()
 
     QStringList dataDirNames;
 #ifdef Q_OS_WIN
-    dataDirNames << qgetenv("APPDATA") + QCoreApplication::organizationDomain() + "/share/apps/quassel/"
+    dataDirNames << QCoreApplication::applicationDirPath() + "/data/quassel/"
                  << qgetenv("APPDATA") + QCoreApplication::organizationDomain() << QCoreApplication::applicationDirPath();
 #elif defined Q_OS_MAC
     dataDirNames << QDir::homePath() + "/Library/Application Support/Quassel/" << QCoreApplication::applicationDirPath();