From 1671201241d49124990bd3ff6680f369a2d2694e Mon Sep 17 00:00:00 2001
From: Kaveh Vahedipour <kaveh@arangodb.com>
Date: Thu, 7 Jun 2018 16:23:10 +0200
Subject: [PATCH] Bugfix/inspector thread (#5553)

---
 arangod/RestHandler/RestStatusHandler.cpp | 4 +---
 js/client/inspector.js                    | 5 +++--
 js/client/modules/@arangodb/inspector.js  | 5 ++++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/arangod/RestHandler/RestStatusHandler.cpp b/arangod/RestHandler/RestStatusHandler.cpp
index 2f4dbfaa2b..865449092b 100644
--- a/arangod/RestHandler/RestStatusHandler.cpp
+++ b/arangod/RestHandler/RestStatusHandler.cpp
@@ -60,9 +60,7 @@ RestStatus RestStatusHandler::execute() {
   result.add("server", VPackValue("arango"));
   result.add("version", VPackValue(ARANGODB_VERSION));
 
-#if defined(TRI_HAVE_POSIX_THREADS)
-  result.add("pid", VPackValue(getpid()));
-#endif
+  result.add("pid", VPackValue(Thread::currentProcessId()));
   
 #ifdef USE_ENTERPRISE
   result.add("license", VPackValue("enterprise"));
diff --git a/js/client/inspector.js b/js/client/inspector.js
index 94ead1db24..05e86fd404 100644
--- a/js/client/inspector.js
+++ b/js/client/inspector.js
@@ -1,5 +1,5 @@
 /* jshint -W051, -W020 */
-/* global global:true, window, require */
+/* global global:true, require */
 'use strict';
 
 // /////////////////////////////////////////////////////////////////////////////
@@ -87,6 +87,7 @@ if (arango.lastErrorMessage()) {
 }
 
 require("@arangodb/inspector");
-require("internal").exit();
+require("process").exit();
+
 
 
diff --git a/js/client/modules/@arangodb/inspector.js b/js/client/modules/@arangodb/inspector.js
index 141a1f86c3..5753640563 100644
--- a/js/client/modules/@arangodb/inspector.js
+++ b/js/client/modules/@arangodb/inspector.js
@@ -584,12 +584,14 @@ function getServerData(arango) {
             }
           }
           
-          const version = arango.GET('_api/version'); // version api
+          const version = arango.GET('_api/version?details=true'); // version api
           const log = arango.GET('_admin/log'); // log api
           const statistics = arango.GET('_admin/statistics'); // statistics api
           var agencyConfig;
+          var agencyState;
           if (server.startsWith("AGNT")) {
             agencyConfig = arango.GET('_api/agency/config');
+            agencyState = arango.GET('_api/agency/state');
           }
           const status = arango.GET('_admin/status');
           const time = require('internal').time();
@@ -646,6 +648,7 @@ function getServerData(arango) {
 
           if (agencyConfig !==  undefined) {
             report[server].config = agencyConfig;
+            report[server].state = agencyState;
           }
           if (top !==  undefined) {
             report[server].top = top;