From 3c89383a2661d346320f7516c930aa913624622a Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 5 Feb 2019 06:49:00 +0900 Subject: [PATCH] Refactoring: Extract showMachineInfo function --- src/index.ts | 16 ++-------------- src/misc/show-machine-info.ts | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 src/misc/show-machine-info.ts diff --git a/src/index.ts b/src/index.ts index 4e88ef3b4..c17f5ee70 100644 --- a/src/index.ts +++ b/src/index.ts @@ -12,7 +12,6 @@ import chalk from 'chalk'; import * as portscanner from 'portscanner'; import * as isRoot from 'is-root'; import Xev from 'xev'; -import * as sysUtils from 'systeminformation'; import Logger from './misc/logger'; import serverStats from './daemons/server-stats'; @@ -23,6 +22,7 @@ import { lessThan } from './prelude/array'; import * as pkg from '../package.json'; import { program } from './argv'; import { checkMongoDB } from './misc/check-mongodb'; +import { showMachineInfo } from './misc/show-machine-info'; const logger = new Logger('core', 'cyan'); const bootLogger = logger.createSubLogger('boot', 'magenta'); @@ -121,18 +121,6 @@ async function isPortAvailable(port: number): Promise { return await portscanner.checkPortStatus(port, '127.0.0.1') === 'closed'; } -async function showMachine() { - const logger = bootLogger.createSubLogger('machine'); - logger.debug(`Hostname: ${os.hostname()}`); - logger.debug(`Platform: ${process.platform}`); - logger.debug(`Architecture: ${process.arch}`); - logger.debug(`CPU: ${os.cpus().length} core`); - const mem = await sysUtils.mem(); - const totalmem = (mem.total / 1024 / 1024 / 1024).toFixed(1); - const availmem = (mem.available / 1024 / 1024 / 1024).toFixed(1); - logger.debug(`MEM: ${totalmem}GB (available: ${availmem}GB)`); -} - function showEnvironment(): void { const env = process.env.NODE_ENV; const logger = bootLogger.createSubLogger('env'); @@ -161,7 +149,7 @@ async function init(): Promise { process.exit(1); } - await showMachine(); + await showMachineInfo(bootLogger); const configLogger = bootLogger.createSubLogger('config'); let config; diff --git a/src/misc/show-machine-info.ts b/src/misc/show-machine-info.ts new file mode 100644 index 000000000..d43735c72 --- /dev/null +++ b/src/misc/show-machine-info.ts @@ -0,0 +1,15 @@ +import * as os from 'os'; +import * as sysUtils from 'systeminformation'; +import Logger from "./logger"; + +export async function showMachineInfo(parentLogger: Logger) { + const logger = parentLogger.createSubLogger('machine'); + logger.debug(`Hostname: ${os.hostname()}`); + logger.debug(`Platform: ${process.platform}`); + logger.debug(`Architecture: ${process.arch}`); + logger.debug(`CPU: ${os.cpus().length} core`); + const mem = await sysUtils.mem(); + const totalmem = (mem.total / 1024 / 1024 / 1024).toFixed(1); + const availmem = (mem.available / 1024 / 1024 / 1024).toFixed(1); + logger.debug(`MEM: ${totalmem}GB (available: ${availmem}GB)`); +}