diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-07-27 18:42:58 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-07-27 18:42:58 +0900 |
| commit | 3d8b45ecdd2c396c106cfba4ffd00fce975a6da4 (patch) | |
| tree | a860888b715bae9ad3045af067a93b1b60e5b6c2 | |
| parent | Merge branch 'master' of https://github.com/syuilo/misskey (diff) | |
| download | sharkey-3d8b45ecdd2c396c106cfba4ffd00fce975a6da4.tar.gz sharkey-3d8b45ecdd2c396c106cfba4ffd00fce975a6da4.tar.bz2 sharkey-3d8b45ecdd2c396c106cfba4ffd00fce975a6da4.zip | |
Use os-utils
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | src/daemons/server-stats.ts | 15 |
2 files changed, 8 insertions, 8 deletions
diff --git a/package.json b/package.json index 7e45b02baf..ecc95d9d64 100644 --- a/package.json +++ b/package.json @@ -160,6 +160,7 @@ "nprogress": "0.2.0", "object-assign-deep": "0.4.0", "on-build-webpack": "0.1.0", + "os-utils": "0.0.14", "parse5": "5.0.0", "portscanner": "2.2.0", "progress-bar-webpack-plugin": "1.11.0", 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 |