From 8a910ad4c7a3b11c1514f519a0650ed029c6a522 Mon Sep 17 00:00:00 2001 From: plowsof Date: Tue, 21 Feb 2023 00:19:30 +0000 Subject: [PATCH] DaemonManager: remove systemd check --- pages/Mining.qml | 8 +------- src/daemon/DaemonManager.cpp | 28 ---------------------------- src/daemon/DaemonManager.h | 1 - 3 files changed, 1 insertion(+), 36 deletions(-) diff --git a/pages/Mining.qml b/pages/Mining.qml index 01ca828d..025f8b92 100644 --- a/pages/Mining.qml +++ b/pages/Mining.qml @@ -299,13 +299,7 @@ Rectangle { startP2Pool() } else { - var underSystemd = daemonManager.checkUnderSystemd(); - if (underSystemd) { - miningError(qsTr("Monerod is managed by Systemd. Manually add --zmq-pub tcp://127.0.0.1:18083 to the unit file
") + translationManager.emptyString) - } - else { - daemonManager.stopAsync(persistentSettings.nettype, persistentSettings.blockchainDataDir, startP2PoolLocal) - } + daemonManager.stopAsync(persistentSettings.nettype, persistentSettings.blockchainDataDir, startP2PoolLocal) } } else { diff --git a/src/daemon/DaemonManager.cpp b/src/daemon/DaemonManager.cpp index f52ab42a..8dd31157 100644 --- a/src/daemon/DaemonManager.cpp +++ b/src/daemon/DaemonManager.cpp @@ -342,34 +342,6 @@ bool DaemonManager::checkLmdbExists(QString datadir) { return validateDataDir(datadir).value("lmdbExists").value(); } -bool DaemonManager::checkUnderSystemd() { - #ifdef Q_OS_LINUX - QProcess p; - QStringList args; - args << "monerod"; - p.setProgram("pgrep"); - p.setArguments(args); - p.start(); - p.waitForFinished(); - QString pid = p.readAllStandardOutput().trimmed(); - if (pid.isEmpty()) { - return false; - } - args.clear(); - - args << "-c"; - args << "ps -eo pid,cgroup | grep " + pid + " | grep -q .service$"; - p.setProgram("sh"); - p.setArguments(args); - p.start(); - p.waitForFinished(); - if (p.exitCode() == 0) { - return true; - } - #endif - return false; -} - QString DaemonManager::getArgs(const QString &dataDir) { if (!running(NetworkType::MAINNET, dataDir)) { return args; diff --git a/src/daemon/DaemonManager.h b/src/daemon/DaemonManager.h index 6a3d0fe1..119e8582 100644 --- a/src/daemon/DaemonManager.h +++ b/src/daemon/DaemonManager.h @@ -59,7 +59,6 @@ public: Q_INVOKABLE QVariantMap validateDataDir(const QString &dataDir) const; Q_INVOKABLE bool checkLmdbExists(QString datadir); Q_INVOKABLE QString getArgs(const QString &dataDir); - Q_INVOKABLE bool checkUnderSystemd(); private: