starts logging when server starts 1

Author: intern1-arizon

README.md

@@ -39,7 +39,7 @@ This package now includes database logging using Prisma with SQL Server. Follow
 
 Replace username, password, localhost, and your_database_name with your actual database credentials.
 
-2. In your main project's root directory, create a `prisma` folder if it doesn't exist. Inside this folder, create a `schema.prisma` file with the following content:
+2. In your main project's root directory, create a `prisma` folder if it doesn't exist. Inside this folder, create a `schema.prisma` file if it doesn't exist and add the following content:
 
    ```prisma
    datasource db {

src/helpers/gather-os-metrics.js

@@ -26,7 +26,7 @@ module.exports = (io, span, config) => {
       return;
     }
 
-    const last = span.responses[span.responses.length - 1];
+    const last = span.responses[span.responses.length - 1] || defaultResponse;
 
     // Convert from B to MB
     stat.memory = stat.memory / 1024 / 1024;
@@ -70,6 +70,8 @@ module.exports = (io, span, config) => {
     if (span.os.length >= span.retention) span.os.shift();
     if (span.responses[0] && span.responses.length > span.retention) span.responses.shift();
 
-    sendMetrics(io, span);
+    if (io) {
+      sendMetrics(io, span);
+    }
   });
 };

src/helpers/socket-io-init.js

@@ -12,25 +12,27 @@ const addSocketEvents = (socket, config) => {
 
 module.exports = (server, config) => {
   if (io === null || io === undefined) {
-    if (config.websocket !== null) {
-      io = config.websocket;
-    } else {
-      io = socketIo(server);
-    }
-
-    io.on('connection', socket => {
-      if (config.authorize) {
-        config
-          .authorize(socket)
-          .then(authorized => {
-            if (!authorized) socket.disconnect('unauthorized');
-            else addSocketEvents(socket, config);
-          })
-          .catch(() => socket.disconnect('unauthorized'));
+    if (server) {
+      if (config.websocket !== null) {
+        io = config.websocket;
       } else {
-        addSocketEvents(socket, config);
+        io = socketIo(server);
       }
-    });
+
+      io.on('connection', socket => {
+        if (config.authorize) {
+          config
+            .authorize(socket)
+            .then(authorized => {
+              if (!authorized) socket.disconnect('unauthorized');
+              else addSocketEvents(socket, config);
+            })
+            .catch(() => socket.disconnect('unauthorized'));
+        } else {
+          addSocketEvents(socket, config);
+        }
+      });
+    }
 
     config.spans.forEach(span => {
       span.os = [];
@@ -40,5 +42,8 @@ module.exports = (server, config) => {
       // Don't keep Node.js process up
       interval.unref();
     });
+
+    // Start gathering metrics immediately
+    gatherOsMetrics(io, config.spans[0], config);
   }
 };

src/middleware-wrapper.js

@@ -64,16 +64,9 @@ const middlewareWrapper = config => {
     }
   };
 
-  /* Provide two properties, the middleware and HTML page renderer separately
-   * so that the HTML page can be authenticated while the middleware can be
-   * earlier in the request handling chain.  Use like:
-   * ```
-   * const statusMonitor = require('express-status-monitor')(config);
-   * server.use(statusMonitor);
-   * server.get('/status', isAuthenticated, statusMonitor.pageRoute);
-   * ```
-   * discussion: https://github.com/RafalWilinski/express-status-monitor/issues/63
-   */
+  // Start logging immediately
+  socketIoInit(null, validatedConfig);
+
   middleware.middleware = middleware;
   middleware.pageRoute = (req, res) => {
     healthChecker(validatedConfig.healthChecks).then(results => {
@@ -84,4 +77,4 @@ const middlewareWrapper = config => {
   return middleware;
 };
 
-module.exports = middlewareWrapper;
+module.exports = middlewareWrapper;