From 6af603b96b6030a5d7bb079e7539696d287288f4 Mon Sep 17 00:00:00 2001 From: Matthew R Date: Sat, 9 Nov 2019 23:46:21 -0500 Subject: [PATCH] factor --- src/commands/whois.ts | 2 +- src/intervals/storage.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/commands/whois.ts b/src/commands/whois.ts index b6e9a90..2b54488 100644 --- a/src/commands/whois.ts +++ b/src/commands/whois.ts @@ -32,7 +32,7 @@ export default class Whois extends Command { embed.addField('Created By', `<@${this.client.users.get(account.createdBy).id}>`, true); embed.addField('Created At', moment(account.createdAt).format('dddd, MMMM Do YYYY, h:mm:ss A'), true); const cpuUsage = await this.client.util.exec(`top -b -n 1 -u ${account.username} | awk 'NR>7 { sum += $9; } END { print sum; }'`); - embed.addField('CPU Usage', `${cpuUsage.split('\n')[0]}%`, true); + embed.addField('CPU Usage', cpuUsage ? `${cpuUsage.split('\n')[0]}%` : '0%', true); embed.addField('Memory', dataConversion(Number(await this.client.util.exec(`memory ${account.username}`))), true); const data = await this.client.redis.get(`storage-${account.username}`) ? dataConversion(Number(await this.client.redis.get(`storage-${account.username}`))) : 'N/A'; embed.addField('Storage', data, true); diff --git a/src/intervals/storage.ts b/src/intervals/storage.ts index b15ca9e..939edf4 100644 --- a/src/intervals/storage.ts +++ b/src/intervals/storage.ts @@ -2,7 +2,7 @@ import fs from 'fs-extra'; import { Client } from '..'; -export default function storage(client: Client) { +export default async function storage(client: Client) { const main = async () => { const accounts = await client.db.Account.find(); for (const account of accounts) { @@ -18,6 +18,7 @@ export default function storage(client: Client) { await client.redis.set(`storage-${account.username}`, bytes); } }; + await main(); setInterval(async () => { await main(); }, 900000);