Terminate monitor process if it hangs

hluk · Feb 2, 2017 · 6d39919 · 6d39919
1 parent 9b6e7da
commit 6d39919
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/src/app/remoteprocess.cpp b/src/app/remoteprocess.cpp
@@ -33,6 +33,7 @@
 
 RemoteProcess::RemoteProcess(QObject *parent)
     : QObject(parent)
+    , m_process(NULL)
     , m_pongRetry(false)
     , m_state(Unconnected)
 {
@@ -42,6 +43,7 @@ RemoteProcess::RemoteProcess(QObject *parent)
 
 RemoteProcess::~RemoteProcess()
 {
+    terminate();
     m_timerPing.stop();
     m_timerPongTimeout.stop();
 }
@@ -73,16 +75,12 @@ void RemoteProcess::start(const QString &newServerName, const QStringList &argum
                .arg(QCoreApplication::applicationFilePath())
                .arg(arguments.join(" ")) );
 
-    qint64 monitorPid;
-    if ( !QProcess::startDetached(QCoreApplication::applicationFilePath(), arguments,
-                                  QString(), &monitorPid) )
-    {
-        log( "Remote process: Failed to start new remote process!", LogError );
-        onConnectionError();
-        return;
-    }
-
-    COPYQ_LOG( QString("Remote process: Started with pid %1.").arg(monitorPid) );
+    terminate();
+    m_process = new QProcess(this);
+    m_process->start(QCoreApplication::applicationFilePath(), arguments, QIODevice::NotOpen);
+    m_process->closeReadChannel(QProcess::StandardOutput);
+    m_process->closeReadChannel(QProcess::StandardError);
+    m_process->closeWriteChannel();
 
     QTimer::singleShot(16000, this, SLOT(checkConnection()));
 }
@@ -151,6 +149,21 @@ void RemoteProcess::onConnectionError()
     emit connectionError();
 }
 
+void RemoteProcess::terminate()
+{
+    if (!m_process)
+        return;
+
+    if (m_process->state() != QProcess::NotRunning) {
+        m_process->terminate();
+        if (!m_process->waitForFinished(100))
+            m_process->kill();
+    }
+
+    m_process->deleteLater();
+    m_process = NULL;
+}
+
 void RemoteProcess::writeMessage(const QByteArray &msg, int messageCode)
 {
     emit sendMessage(msg, messageCode);

diff --git a/src/app/remoteprocess.h b/src/app/remoteprocess.h
@@ -26,6 +26,7 @@
 class ClientSocket;
 class Server;
 class QByteArray;
+class QProcess;
 class QString;
 
 /**
@@ -84,6 +85,9 @@ private slots:
     void onConnectionError();
 
 private:
+    void terminate();
+
+    QProcess *m_process;
     QTimer m_timerPing;
     QTimer m_timerPongTimeout;
     bool m_pongRetry;