improved diagnostics routine

2 files changed, 10 insertions, 4 deletions

diff --git a/src/client/util/ClientDiagnostics.ts b/src/client/util/ClientDiagnostics.ts
index e454cdecb..6f82a47db 100644
--- a/src/client/util/ClientDiagnostics.ts
+++ b/src/client/util/ClientDiagnostics.ts
@@ -16,10 +16,12 @@ export namespace ClientDiagnostics {
         }, 100);
 
 
+        let executed = false;
         const solrHandle = setInterval(async () => {
             const response = await fetch("/solrHeartbeat");
-            if (!response) {
-                alert("Looks like SOLR is not running on your machine.");
+            if (!(await response.json()).running) {
+                !executed && alert("Looks like SOLR is not running on your machine.");
+                executed = true;
                 clearInterval(solrHandle);
             }
         }, 100);
diff --git a/src/server/ApiManagers/DiagnosticManager.ts b/src/server/ApiManagers/DiagnosticManager.ts
index b775167b6..104985481 100644
--- a/src/server/ApiManagers/DiagnosticManager.ts
+++ b/src/server/ApiManagers/DiagnosticManager.ts
@@ -16,8 +16,12 @@ export default class DiagnosticManager extends ApiManager {
             method: Method.GET,
             subscription: "/solrHeartbeat",
             onValidation: async ({ res }) => {
-                const response = await request("http://localhost:8983");
-                res.send(response !== undefined);
+                try {
+                    await request("http://localhost:8983");
+                    res.send({ running: true });
+                } catch (e) {
+                    res.send({ running: false });
+                }
             }
         });