heartbeats

2 files changed, 27 insertions, 1 deletions

diff --git a/src/server/ApiManagers/DiagnosticManager.ts b/src/server/ApiManagers/DiagnosticManager.ts
new file mode 100644
index 000000000..b775167b6
--- /dev/null
+++ b/src/server/ApiManagers/DiagnosticManager.ts
@@ -0,0 +1,26 @@
+import ApiManager, { Registration } from "./ApiManager";
+import { Method } from "../RouteManager";
+import request = require('request-promise');
+
+export default class DiagnosticManager extends ApiManager {
+
+    protected initialize(register: Registration): void {
+
+        register({
+            method: Method.GET,
+            subscription: "/serverHeartbeat",
+            onValidation: ({ res }) => res.send(true)
+        });
+
+        register({
+            method: Method.GET,
+            subscription: "/solrHeartbeat",
+            onValidation: async ({ res }) => {
+                const response = await request("http://localhost:8983");
+                res.send(response !== undefined);
+            }
+        });
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/server/ApiManagers/UserManager.ts b/src/server/ApiManagers/UserManager.ts
index 4ee5a2b85..8edeab16d 100644
--- a/src/server/ApiManagers/UserManager.ts
+++ b/src/server/ApiManagers/UserManager.ts
@@ -56,7 +56,7 @@ export default class UserManager extends ApiManager {
                 const process = (target: { user: string, duration: number }[]) => {
                     const comparator = (first: ActivityUnit, second: ActivityUnit) => first.duration - second.duration;
                     const sorted = target.sort(comparator);
-                    return sorted.map(({ user, duration }) => `${user} (last active ${msToTime(duration)} ago)`);
+                    return sorted.map(({ user, duration }) => `${user} (${msToTime(duration)})`);
                 };
 
                 res.render("user_activity.pug", {