aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-12-21 21:54:47 +0200
committerRiccardo Spagni <ric@spagni.net>2016-12-21 21:54:47 +0200
commit7b049bbae9c563763bd9cfdfc31109c44be3c308 (patch)
treeafc7d39f7359e7b07340fce7138fd51aabbc125e /src
parent53ff336f00e3c148b6c8531da0bb878fe9c5f230 (diff)
parentf94782fecfd90524e295e56b6e4f52a4b411ff03 (diff)
downloadmonzero-gui-7b049bbae9c563763bd9cfdfc31109c44be3c308.tar.gz
monzero-gui-7b049bbae9c563763bd9cfdfc31109c44be3c308.tar.xz
monzero-gui-7b049bbae9c563763bd9cfdfc31109c44be3c308.zip
Merge pull request #322
f94782f daemon startup flags (Jaquee)
Diffstat (limited to 'src')
-rw-r--r--src/daemon/DaemonManager.cpp13
-rw-r--r--src/daemon/DaemonManager.h2
2 files changed, 12 insertions, 3 deletions
diff --git a/src/daemon/DaemonManager.cpp b/src/daemon/DaemonManager.cpp
index 185cde1e..e85db709 100644
--- a/src/daemon/DaemonManager.cpp
+++ b/src/daemon/DaemonManager.cpp
@@ -23,7 +23,7 @@ DaemonManager *DaemonManager::instance(const QStringList *args)
return m_instance;
}
-bool DaemonManager::start()
+bool DaemonManager::start(const QString &flags)
{
//
QString process;
@@ -43,9 +43,18 @@ bool DaemonManager::start()
QStringList arguments;
foreach (const QString &str, m_clArgs) {
qDebug() << QString(" [%1] ").arg(str);
- arguments << str;
+ if (!str.isEmpty())
+ arguments << str;
}
+ // Custom startup flags for daemon
+ foreach (const QString &str, flags.split(" ")) {
+ qDebug() << QString(" [%1] ").arg(str);
+ if (!str.isEmpty())
+ arguments << str;
+ }
+
+
qDebug() << "starting monerod " + process;
qDebug() << "With command line arguments " << arguments;
diff --git a/src/daemon/DaemonManager.h b/src/daemon/DaemonManager.h
index 8f425fd5..7c9730e8 100644
--- a/src/daemon/DaemonManager.h
+++ b/src/daemon/DaemonManager.h
@@ -13,7 +13,7 @@ public:
static DaemonManager * instance(const QStringList *args);
- Q_INVOKABLE bool start();
+ Q_INVOKABLE bool start(const QString &flags);
Q_INVOKABLE bool stop();
// return true if daemon process is started