profxadke
/
misskey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/syuilo/misskey

This commit is contained in:
syuilo 2018-07-27 18:18:49 +09:00
parent 6b19e54c23 75d04858e6
commit b7b82456d8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -75,6 +75,7 @@
"@types/showdown": "1.7.5", "@types/showdown": "1.7.5",
"@types/single-line-log": "1.1.0", "@types/single-line-log": "1.1.0",
"@types/speakeasy": "2.0.2", "@types/speakeasy": "2.0.2",
"@types/systeminformation": "3.23.0",
"@types/tmp": "0.0.33", "@types/tmp": "0.0.33",
"@types/uuid": "3.4.3", "@types/uuid": "3.4.3",
"@types/webpack": "4.4.8", "@types/webpack": "4.4.8",

4
src/daemons/server-stats.ts
View File

@ -1,5 +1,5 @@
import * as os from 'os'; import * as os from 'os';
const sysUtils = require('systeminformation'); import * as sysUtils from 'systeminformation';
import * as diskusage from 'diskusage'; import * as diskusage from 'diskusage';
import Xev from 'xev'; import Xev from 'xev';
@ -61,6 +61,7 @@ async function usedMem() {
return data.active; return data.active;
} catch (error) { } catch (error) {
console.error(error); console.error(error);
throw error;
} }
} }
@ -71,5 +72,6 @@ async function totalMem() {
return data.total; return data.total;
} catch (error) { } catch (error) {
console.error(error); console.error(error);
throw error;
} }
} }