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

Merge pull request #2765

Browse Source 
0629f06 DaemonManager: check monerod binary, error details on start failure (xiphon)
This commit is contained in:
luigi1111
2020-02-05 21:42:11 -05:00
parent 4b1a6eb49b 0629f06156
commit eb7fae92ef
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/daemon/DaemonManager.cpp
View File

@@ -63,6 +63,12 @@ DaemonManager *DaemonManager::instance(const QStringList *args)
bool DaemonManager::start(const QString &flags, NetworkType::Type nettype, const QString &dataDir, const QString &bootstrapNodeAddress, bool noSync /* = false*/)
{
if (!QFileInfo(m_monerod).isFile())
{
emit daemonStartFailure("\"" + QDir::toNativeSeparators(m_monerod) + "\" " + tr("executable is missing"));
return false;
}
// prepare command line arguments and pass to monerod
QStringList arguments;
@@ -130,7 +136,7 @@ bool DaemonManager::start(const QString &flags, NetworkType::Type nettype, const
if (!started) {
qDebug() << "Daemon start error: " + m_daemon->errorString();
emit daemonStartFailure();
emit daemonStartFailure(m_daemon->errorString());
return false;
}
@@ -140,7 +146,7 @@ bool DaemonManager::start(const QString &flags, NetworkType::Type nettype, const
emit daemonStarted();
m_noSync = noSync;
} else {
emit daemonStartFailure();
emit daemonStartFailure(tr("Timed out, local node is not responding after %1 seconds").arg(DAEMON_START_TIMEOUT_SECONDS));
}
});

2
src/daemon/DaemonManager.h
View File

@@ -64,7 +64,7 @@ private:
signals:
void daemonStarted() const;
void daemonStopped() const;
void daemonStartFailure() const;
void daemonStartFailure(const QString &error) const;
void daemonConsoleUpdated(QString message) const;
public slots: