From 6c5a78aeb264ef458a2cea0bfe516172e8f1f5e7 Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Tue, 6 Nov 2018 03:31:16 +0900 Subject: [PATCH] Fix #3133 (#3134) --- src/index.ts | 2 +- src/misc/machineInfo.ts | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/index.ts b/src/index.ts index 259f5b1b0c..ae358105fb 100644 --- a/src/index.ts +++ b/src/index.ts @@ -114,7 +114,7 @@ async function init(): Promise { Logger.info(`<<< Misskey v${pkg.version} >>>`); new Logger('Deps').info(`Node.js ${process.version}`); - MachineInfo.show(); + await MachineInfo.show(); EnvironmentInfo.show(); const configLogger = new Logger('Config'); diff --git a/src/misc/machineInfo.ts b/src/misc/machineInfo.ts index 6049bcfc9c..7d8a52ff9a 100644 --- a/src/misc/machineInfo.ts +++ b/src/misc/machineInfo.ts @@ -1,15 +1,17 @@ import * as os from 'os'; import Logger from './logger'; +import * as sysUtils from 'systeminformation'; export default class { - public static show(): void { - const totalmem = (os.totalmem() / 1024 / 1024 / 1024).toFixed(1); - const freemem = (os.freemem() / 1024 / 1024 / 1024).toFixed(1); + public static async show() { const logger = new Logger('Machine'); logger.info(`Hostname: ${os.hostname()}`); logger.info(`Platform: ${process.platform}`); logger.info(`Architecture: ${process.arch}`); logger.info(`CPU: ${os.cpus().length} core`); - logger.info(`MEM: ${totalmem}GB (available: ${freemem}GB)`); + const mem = await sysUtils.mem(); + const totalmem = (mem.total / 1024 / 1024 / 1024).toFixed(1); + const availmem = (mem.available / 1024 / 1024 / 1024).toFixed(1); + logger.info(`MEM: ${totalmem}GB (available: ${availmem}GB)`); } }