From aaf9b9ac7feac8fe644465c7085193ed8156a1ec Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 1 Jun 2017 11:20:36 -0700
Subject: [PATCH] Update server-console to watch interface via pid rather than
 marker

---
 interface/src/main.cpp                    |  2 +-
 libraries/networking/src/SandboxUtils.cpp |  8 ++++----
 libraries/networking/src/SandboxUtils.h   |  2 +-
 server-console/src/main.js                | 22 ++++++++++++++++++++++
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 49517eb38e..3862bcc52f 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -200,7 +200,7 @@ int main(int argc, const char* argv[]) {
         bool serverContentPathOptionIsSet = parser.isSet(serverContentPathOption);
         QString serverContentPath = serverContentPathOptionIsSet ? parser.value(serverContentPathOption) : QString();
         if (runServer) {
-            SandboxUtils::runLocalSandbox(serverContentPath, true, RUNNING_MARKER_FILENAME, noUpdater);
+            SandboxUtils::runLocalSandbox(serverContentPath, true, noUpdater);
         }
 
         Application app(argc, const_cast<char**>(argv), startupTime, runningMarkerExisted);
diff --git a/libraries/networking/src/SandboxUtils.cpp b/libraries/networking/src/SandboxUtils.cpp
index d816f7ebee..c62bd8f982 100644
--- a/libraries/networking/src/SandboxUtils.cpp
+++ b/libraries/networking/src/SandboxUtils.cpp
@@ -52,9 +52,8 @@ bool readStatus(QByteArray statusData) {
     return false;
 }
 
-void runLocalSandbox(QString contentPath, bool autoShutdown, QString runningMarkerName, bool noUpdater) {
+void runLocalSandbox(QString contentPath, bool autoShutdown, bool noUpdater) {
     QString serverPath = "./server-console/server-console.exe";
-    qCDebug(networking) << "Running marker path is: " << runningMarkerName;
     qCDebug(networking) << "Server path is: " << serverPath;
     qCDebug(networking) << "autoShutdown: " << autoShutdown;
     qCDebug(networking) << "noUpdater: " << noUpdater;
@@ -74,8 +73,9 @@ void runLocalSandbox(QString contentPath, bool autoShutdown, QString runningMark
     }
 
     if (autoShutdown) {
-        QString interfaceRunningStateFile = RunningMarker::getMarkerFilePath(runningMarkerName);
-        args << "--shutdownWatcher" << interfaceRunningStateFile;
+        auto pid = qApp->applicationPid();
+        qCDebug(networking) << "autoShutdown pid is" << pid;
+        args << "--watchProcessShutdown" << QString::number(pid);
     }
 
     if (noUpdater) {
diff --git a/libraries/networking/src/SandboxUtils.h b/libraries/networking/src/SandboxUtils.h
index 42484b8edf..370b28e1b0 100644
--- a/libraries/networking/src/SandboxUtils.h
+++ b/libraries/networking/src/SandboxUtils.h
@@ -21,7 +21,7 @@ namespace SandboxUtils {
 
     QNetworkReply* getStatus();
     bool readStatus(QByteArray statusData);
-    void runLocalSandbox(QString contentPath, bool autoShutdown, QString runningMarkerName, bool noUpdater);
+    void runLocalSandbox(QString contentPath, bool autoShutdown, bool noUpdater);
 };
 
 #endif // hifi_SandboxUtils_h
diff --git a/server-console/src/main.js b/server-console/src/main.js
index 98bda9a10f..725c6ca0c8 100644
--- a/server-console/src/main.js
+++ b/server-console/src/main.js
@@ -821,6 +821,15 @@ for (var key in trayIcons) {
 
 const notificationIcon = path.join(__dirname, '../resources/console-notification.png');
 
+function isProcessRunning(pid) {
+    try {
+        running = process.kill(pid, 0);
+        return true;
+    } catch (e) {
+    }
+    return false;
+}
+
 function onContentLoaded() {
     // Disable splash window for now.
     // maybeShowSplash();
@@ -882,6 +891,19 @@ function onContentLoaded() {
         startInterface();
     }
 
+    if (argv.watchProcessShutdown) {
+        let pid = argv.watchProcessShutdown;
+        console.log("Watching process: ", pid);
+        let watchProcessInterval = setInterval(function() {
+            let isRunning = isProcessRunning(pid);
+            if (!isRunning) {
+                log.debug("Watched process is no longer running, shutting down");
+                clearTimeout(watchProcessInterval);
+                forcedShutdown();
+            }
+        }, 5000);
+    }
+
     // If we were launched with the shutdownWatcher option, then we need to watch for the interface app
     // shutting down. The interface app will regularly update a running state file which we will check.
     // If the file doesn't exist or stops updating for a significant amount of time, we will shut down.