Поправки вывода в лог
This commit is contained in:
@@ -52,7 +52,7 @@ class WebWorker {
|
|||||||
ayncExit.add(this.closeDb.bind(this));
|
ayncExit.add(this.closeDb.bind(this));
|
||||||
|
|
||||||
this.loadOrCreateDb();//no await
|
this.loadOrCreateDb();//no await
|
||||||
this.logServerStats();//no await
|
this.periodicLogServerStats();//no await
|
||||||
|
|
||||||
const dirConfig = [
|
const dirConfig = [
|
||||||
{
|
{
|
||||||
@@ -169,6 +169,8 @@ class WebWorker {
|
|||||||
this.db = db;
|
this.db = db;
|
||||||
|
|
||||||
log('Searcher DB ready');
|
log('Searcher DB ready');
|
||||||
|
|
||||||
|
this.logServerStats();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
log(LM_FATAL, e.message);
|
log(LM_FATAL, e.message);
|
||||||
ayncExit.exit(1);
|
ayncExit.exit(1);
|
||||||
@@ -440,17 +442,24 @@ class WebWorker {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async logServerStats() {
|
logServerStats() {
|
||||||
while (1) {// eslint-disable-line
|
try {
|
||||||
try {
|
const memUsage = process.memoryUsage().rss/(1024*1024);//Mb
|
||||||
const memUsage = process.memoryUsage().rss/(1024*1024);//Mb
|
let loadAvg = os.loadavg();
|
||||||
let loadAvg = os.loadavg();
|
loadAvg = loadAvg.map(v => v.toFixed(2));
|
||||||
loadAvg = loadAvg.map(v => v.toFixed(2));
|
|
||||||
|
|
||||||
log(`Server info [ memUsage: ${memUsage.toFixed(2)}MB, loadAvg: (${loadAvg.join(', ')}) ]`);
|
log(`Server info [ memUsage: ${memUsage.toFixed(2)}MB, loadAvg: (${loadAvg.join(', ')}) ]`);
|
||||||
} catch (e) {
|
|
||||||
log(LM_ERR, e.message);
|
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);
|
await utils.sleep(60*1000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -165,9 +165,9 @@ async function main() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const serverConfig = config.server;
|
server.listen(config.server.port, config.server.host, () => {
|
||||||
server.listen(serverConfig.port, serverConfig.host, () => {
|
config.server.ready = true;
|
||||||
log(`Server is ready on http://${serverConfig.host}:${serverConfig.port}`);
|
log(`Server ready`);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user