From 3d8b45ecdd2c396c106cfba4ffd00fce975a6da4 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 27 Jul 2018 18:42:58 +0900 Subject: Use os-utils --- src/daemons/server-stats.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/daemons') diff --git a/src/daemons/server-stats.ts b/src/daemons/server-stats.ts index de70cf40b8..0c0a72f747 100644 --- a/src/daemons/server-stats.ts +++ b/src/daemons/server-stats.ts @@ -2,6 +2,7 @@ import * as os from 'os'; import * as sysUtils from 'systeminformation'; import * as diskusage from 'diskusage'; import Xev from 'xev'; +const osUtils = require('os-utils'); const ev = new Xev(); @@ -44,14 +45,12 @@ export default function() { } // CPU STAT -async function cpuUsage() { - try { - const data = await sysUtils.currentLoad(); - return Math.floor(data.currentload / 100); - } catch (error) { - console.error(error); - throw error; - } +function cpuUsage() { + return new Promise((res, rej) => { + osUtils.cpuUsage((cpuUsage: number) => { + res(cpuUsage); + }); + }); } // MEMORY(excl buffer + cache) STAT -- cgit v1.2.3-freya