From 252376412f3049274c6bcf005408071d0b42d018 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 14 Oct 2022 15:22:40 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=B0=20=D0=B2=20=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/WebWorker.js | 31 ++++++++++++++++++++-----------
 server/index.js          |  6 +++---
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/server/core/WebWorker.js b/server/core/WebWorker.js
index b877a32..244cb3f 100644
--- a/server/core/WebWorker.js
+++ b/server/core/WebWorker.js
@@ -52,7 +52,7 @@ class WebWorker {
             ayncExit.add(this.closeDb.bind(this));
 
             this.loadOrCreateDb();//no await
-            this.logServerStats();//no await
+            this.periodicLogServerStats();//no await
 
             const dirConfig = [
                 {
@@ -169,6 +169,8 @@ class WebWorker {
             this.db = db;
 
             log('Searcher DB ready');
+
+            this.logServerStats();
         } catch (e) {
             log(LM_FATAL, e.message);            
             ayncExit.exit(1);
@@ -440,17 +442,24 @@ class WebWorker {
         }
     }
 
-    async logServerStats() {
-        while (1) {// eslint-disable-line
-            try {
-                const memUsage = process.memoryUsage().rss/(1024*1024);//Mb
-                let loadAvg = os.loadavg();
-                loadAvg = loadAvg.map(v => v.toFixed(2));
+    logServerStats() {
+        try {
+            const memUsage = process.memoryUsage().rss/(1024*1024);//Mb
+            let loadAvg = os.loadavg();
+            loadAvg = loadAvg.map(v => v.toFixed(2));
 
-                log(`Server info [ memUsage: ${memUsage.toFixed(2)}MB, loadAvg: (${loadAvg.join(', ')}) ]`);
-            } catch (e) {
-                log(LM_ERR, e.message);
-            }
+            log(`Server info [ memUsage: ${memUsage.toFixed(2)}MB, loadAvg: (${loadAvg.join(', ')}) ]`);
+
+            if (this.config.server.ready)
+                log(`Server listening on http://${this.config.server.host}:${this.config.server.port}`);
+        } catch (e) {
+            log(LM_ERR, e.message);
+        }
+    }
+    
+    async periodicLogServerStats() {
+        while (1) {// eslint-disable-line
+            this.logServerStats();
             await utils.sleep(60*1000);
         }
     }
diff --git a/server/index.js b/server/index.js
index 20f1702..9f49286 100644
--- a/server/index.js
+++ b/server/index.js
@@ -165,9 +165,9 @@ async function main() {
         });
     }
 
-    const serverConfig = config.server;
-    server.listen(serverConfig.port, serverConfig.host, () => {
-        log(`Server is ready on http://${serverConfig.host}:${serverConfig.port}`);
+    server.listen(config.server.port, config.server.host, () => {
+        config.server.ready = true;
+        log(`Server ready`);
     });
 }