monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-17 00:07:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit eb7fae92ef
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main.qml
View file

@ -699,13 +699,13 @@ ApplicationWindow {
currentWallet.connected(true); currentWallet.connected(true);
} }
function onDaemonStartFailure(){ function onDaemonStartFailure(error) {
console.log("daemon start failed"); console.log("daemon start failed");
hideProcessingSplash(); hideProcessingSplash();
// resume refresh // resume refresh
currentWallet.startRefresh(); currentWallet.startRefresh();
informationPopup.title = qsTr("Daemon failed to start") + translationManager.emptyString; informationPopup.title = qsTr("Daemon failed to start") + translationManager.emptyString;
informationPopup.text = qsTr("Please check your wallet and daemon log for errors. You can also try to start %1 manually.").arg((isWindows)? "monerod.exe" : "monerod") informationPopup.text = error + ".\n\n" + qsTr("Please check your wallet and daemon log for errors. You can also try to start %1 manually.").arg((isWindows)? "monerod.exe" : "monerod")
informationPopup.icon = StandardIcon.Critical informationPopup.icon = StandardIcon.Critical
informationPopup.onCloseCallback = null informationPopup.onCloseCallback = null
informationPopup.open(); informationPopup.open();

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*/) 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 // prepare command line arguments and pass to monerod
QStringList arguments; QStringList arguments;
@ -130,7 +136,7 @@ bool DaemonManager::start(const QString &flags, NetworkType::Type nettype, const
if (!started) { if (!started) {
qDebug() << "Daemon start error: " + m_daemon->errorString(); qDebug() << "Daemon start error: " + m_daemon->errorString();
emit daemonStartFailure(); emit daemonStartFailure(m_daemon->errorString());
return false; return false;
} }
@ -140,7 +146,7 @@ bool DaemonManager::start(const QString &flags, NetworkType::Type nettype, const
emit daemonStarted(); emit daemonStarted();
m_noSync = noSync; m_noSync = noSync;
} else { } 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: signals:
void daemonStarted() const; void daemonStarted() const;
void daemonStopped() const; void daemonStopped() const;
void daemonStartFailure() const; void daemonStartFailure(const QString &error) const;
void daemonConsoleUpdated(QString message) const; void daemonConsoleUpdated(QString message) const;
public slots: public slots: