monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-18 16:54:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

daemon: timeout after 5 seconds when launching monerod

Browse source
This commit is contained in:
hinto.janai 2023-11-13 20:10:09 -05:00
parent e9cd4588ae
commit 182903e28c
No known key found for this signature in database
GPG key ID: D47CE05FA175A499
2 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/daemon/DaemonManager.cpp
View file

@ -146,7 +146,7 @@ void DaemonManager::stopAsync(NetworkType::Type nettype, const QString &dataDir,
{ {
const auto feature = m_scheduler.run([this, nettype, dataDir] { const auto feature = m_scheduler.run([this, nettype, dataDir] {
QString message; QString message;
sendCommand({"exit"}, nettype, dataDir, message); sendCommand({"exit"}, nettype, dataDir, message, /* no timeout */ -1);
return QJSValueList({stopWatcher(nettype, dataDir)}); return QJSValueList({stopWatcher(nettype, dataDir)});
}, callback); }, callback);
@ -239,9 +239,21 @@ void DaemonManager::printError()
bool DaemonManager::running(NetworkType::Type nettype, const QString &dataDir) const bool DaemonManager::running(NetworkType::Type nettype, const QString &dataDir) const
{ {
QString status; QString status;
sendCommand({"sync_info"}, nettype, dataDir, status); bool started = sendCommand(
{"sync_info"},
nettype,
dataDir,
status,
// milliseconds before the command
// timesout and returns `false`.
5000
);
qDebug() << status; qDebug() << status;
return status.contains("Height:");
// Did `monerod` start successfully
// and print out its height?
return started && status.contains("Height:");
} }
bool DaemonManager::noSync() const noexcept bool DaemonManager::noSync() const noexcept
@ -256,7 +268,12 @@ void DaemonManager::runningAsync(NetworkType::Type nettype, const QString &dataD
}, callback); }, callback);
} }
bool DaemonManager::sendCommand(const QStringList &cmd, NetworkType::Type nettype, const QString &dataDir, QString &message) const // If launching `monerod` takes longer
// than `ms_timeout` amount of milliseconds,
// this function will fail and return `false`.
//
// Providing `-1` as the timeout means no timeout.
bool DaemonManager::sendCommand(const QStringList &cmd, NetworkType::Type nettype, const QString &dataDir, QString &message, const int ms_timeout) const
{ {
QProcess p; QProcess p;
QStringList external_cmd(cmd); QStringList external_cmd(cmd);
@ -277,7 +294,14 @@ bool DaemonManager::sendCommand(const QStringList &cmd, NetworkType::Type nettyp
p.start(m_monerod, external_cmd); p.start(m_monerod, external_cmd);
bool started = p.waitForFinished(-1); bool started = p.waitForFinished(ms_timeout);
// `monerod` either failed to start or
// took longer than `ms_timeout` to start.
if (!started) {
return false;
}
message = p.readAllStandardOutput(); message = p.readAllStandardOutput();
emit daemonConsoleUpdated(message); emit daemonConsoleUpdated(message);
return started; return started;
@ -287,7 +311,7 @@ void DaemonManager::sendCommandAsync(const QStringList &cmd, NetworkType::Type n
{ {
m_scheduler.run([this, cmd, nettype, dataDir] { m_scheduler.run([this, cmd, nettype, dataDir] {
QString message; QString message;
return QJSValueList({sendCommand(cmd, nettype, dataDir, message)}); return QJSValueList({sendCommand(cmd, nettype, dataDir, message, /* no timeout */ -1)});
}, callback); }, callback);
} }

2
src/daemon/DaemonManager.h
View file

@ -63,7 +63,7 @@ public:
private: private:
bool running(NetworkType::Type nettype, const QString &dataDir) const; bool running(NetworkType::Type nettype, const QString &dataDir) const;
bool sendCommand(const QStringList &cmd, NetworkType::Type nettype, const QString &dataDir, QString &message) const; bool sendCommand(const QStringList &cmd, NetworkType::Type nettype, const QString &dataDir, QString &message, const int ms_timeout) const;
bool startWatcher(NetworkType::Type nettype, const QString &dataDir) const; bool startWatcher(NetworkType::Type nettype, const QString &dataDir) const;
bool stopWatcher(NetworkType::Type nettype, const QString &dataDir) const; bool stopWatcher(NetworkType::Type nettype, const QString &dataDir) const;
signals: signals: