Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

DaemonManager: forward command line arguments to monerod

Browse Source
This commit is contained in:
Jacob Brydolf
2016-11-07 18:08:09 +01:00
committed by Jaquee
parent 752ff2616f
commit b4eb489b00
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/daemon/DaemonManager.cpp
View File

@@ -9,11 +9,15 @@
#include <QProcess> #include <QProcess>
DaemonManager * DaemonManager::m_instance = nullptr; DaemonManager * DaemonManager::m_instance = nullptr;
QStringList DaemonManager::clArgs;
DaemonManager *DaemonManager::instance() DaemonManager *DaemonManager::instance(QStringList args)
{ {
if (!m_instance) { if (!m_instance) {
m_instance = new DaemonManager; m_instance = new DaemonManager;
// store command line arguments for later use
clArgs = args;
clArgs.removeFirst();
} }
return m_instance; return m_instance;
@@ -35,10 +39,16 @@ bool DaemonManager::start()
return false; return false;
} }
qDebug() << "starting monerod " + process;
// TODO: forward CLI arguments // prepare command line arguments and pass to monerod
QStringList arguments; QStringList arguments;
foreach (const QString &str, clArgs) {
qDebug() << QString(" [%1] ").arg(str);
arguments << str;
}
qDebug() << "starting monerod " + process;
qDebug() << "With command line arguments " << arguments;
m_daemon = new QProcess(); m_daemon = new QProcess();
initialized = true; initialized = true;
@@ -47,8 +57,8 @@ bool DaemonManager::start()
connect (m_daemon, SIGNAL(readyReadStandardOutput()), this, SLOT(printOutput())); connect (m_daemon, SIGNAL(readyReadStandardOutput()), this, SLOT(printOutput()));
connect (m_daemon, SIGNAL(readyReadStandardError()), this, SLOT(printError())); connect (m_daemon, SIGNAL(readyReadStandardError()), this, SLOT(printError()));
// Start monerod
m_daemon->start(process); m_daemon->start(process,arguments);
bool started = m_daemon->waitForStarted(); bool started = m_daemon->waitForStarted();
if(!started){ if(!started){

3
src/daemon/DaemonManager.h
View File

@@ -11,7 +11,7 @@ class DaemonManager : public QObject
public: public:
static DaemonManager * instance(); static DaemonManager * instance(QStringList args);
Q_INVOKABLE bool start(); Q_INVOKABLE bool start();
Q_INVOKABLE bool stop(); Q_INVOKABLE bool stop();
@@ -32,6 +32,7 @@ private:
explicit DaemonManager(QObject *parent = 0); explicit DaemonManager(QObject *parent = 0);
static DaemonManager * m_instance; static DaemonManager * m_instance;
static QStringList clArgs;
QProcess *m_daemon; QProcess *m_daemon;
bool initialized = false; bool initialized = false;