feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

RemoteLinux: Use reaper timeout setting also in signal operation

Browse Source 
Fixes: QTCREATORBUG-31200
Change-Id: I5093f761c58551702cbc82ad16e4034ef30efb38
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2024-07-04 19:55:23 +02:00
parent 1a7bf9c95d
commit 8da67b75c5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/remotelinux/remotelinuxsignaloperation.cpp
View File

@@ -5,6 +5,7 @@
#include "remotelinuxtr.h" #include "remotelinuxtr.h"
#include <projectexplorer/projectexplorersettings.h>
#include <utils/commandline.h> #include <utils/commandline.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
@@ -50,8 +51,10 @@ static QString signalProcessGroupByNameCommandLine(const QString &filePath, int
QString RemoteLinuxSignalOperation::killProcessByNameCommandLine(const QString &filePath) const QString RemoteLinuxSignalOperation::killProcessByNameCommandLine(const QString &filePath) const
{ {
return QString::fromLatin1("%1; %2").arg(signalProcessGroupByNameCommandLine(filePath, 15), return QString::fromLatin1("%1; sleep %2; %3")
signalProcessGroupByNameCommandLine(filePath, 9)); .arg(signalProcessGroupByNameCommandLine(filePath, 15))
.arg(projectExplorerSettings().reaperTimeoutInSeconds)
.arg(signalProcessGroupByNameCommandLine(filePath, 9));
} }
QString RemoteLinuxSignalOperation::interruptProcessByNameCommandLine(const QString &filePath) const QString RemoteLinuxSignalOperation::interruptProcessByNameCommandLine(const QString &filePath) const