Public/monero-gui
1
0
Fork 1
mirror of https://github.com/monero-project/monero-gui.git synced 2026-04-02 16:57:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

DaemonManager: refactoring - drop singleton usage

Browse Source
This commit is contained in:
xiphon
2021-01-14 19:14:22 +00:00
parent 3ca5f10fa8
commit d3102b1cc5
3 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/daemon/DaemonManager.cpp
View File

@@ -47,23 +47,6 @@ namespace {
static const int DAEMON_START_TIMEOUT_SECONDS = 120;
}
DaemonManager * DaemonManager::m_instance = nullptr;
QStringList DaemonManager::m_clArgs;
DaemonManager *DaemonManager::instance(const QStringList *args/* = nullptr*/)
{
if (!m_instance) {
m_instance = new DaemonManager;
// store command line arguments for later use
if (args != nullptr)
{
m_clArgs = *args;
}
}
return m_instance;
}
bool DaemonManager::start(const QString &flags, NetworkType::Type nettype, const QString &dataDir, const QString &bootstrapNodeAddress, bool noSync /* = false*/)
{
if (!QFileInfo(m_monerod).isFile())
@@ -85,12 +68,6 @@ bool DaemonManager::start(const QString &flags, NetworkType::Type nettype, const
else if (nettype == NetworkType::STAGENET)
arguments << "--stagenet";
foreach (const QString &str, m_clArgs) {
qDebug() << QString(" [%1] ").arg(str);
if (!str.isEmpty())
arguments << str;
}
// Custom startup flags for daemon
foreach (const QString &str, flags.split(" ")) {
qDebug() << QString(" [%1] ").arg(str);