AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfix: Correctly use QProcess::start and QProcess::execute (#1331)

Browse source 
Affected functions (all on Linux/Mac):
 - `RouterLinux::flushDns` was not reloading the DNS manager.
 - `Utils::processIsRunning` was always saying that the process
   is not running when `fullFlag` was set to `false`.
 - `Utils::killProcessByName` was not killing anything.
This commit is contained in:
Andrey Alekseenko 2024-12-31 03:21:40 +00:00 • committed by GitHub
parent 6acaab0ffa
commit a741186c21
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/utilities.cpp
View file

@ -194,8 +194,13 @@ bool Utils::processIsRunning(const QString &fileName, const bool fullFlag)
return false;
#else
QProcess process;
QStringList arguments;
if (fullFlag) {
arguments << "-f";
}
arguments << fileName;
process.setProcessChannelMode(QProcess::MergedChannels);
process.start("pgrep", QStringList({ fullFlag ? "-f" : "", fileName }));
process.start("pgrep", arguments);
process.waitForFinished();
if (process.exitStatus() == QProcess::NormalExit) {
if (fullFlag) {
@ -248,7 +253,7 @@ bool Utils::killProcessByName(const QString &name)
#elif defined Q_OS_IOS || defined(Q_OS_ANDROID)
return false;
#else
return QProcess::execute(QString("pkill %1").arg(name)) == 0;
return QProcess::execute("pkill", { name }) == 0;
#endif
}

4
service/server/router_linux.cpp
View file

@ -162,11 +162,11 @@ void RouterLinux::flushDns()
|| QFileInfo::exists("/usr/sbin/nscd")
|| QFileInfo::exists("/usr/lib/systemd/system/nscd.service"))
{
p.start("systemctl restart nscd");
p.start("systemctl", { "restart", "nscd" });
}
else
{
p.start("systemctl restart systemd-resolved");
p.start("systemctl", { "restart", "systemd-resolved" });
}
p.waitForFinished();