From 9c95f8ea04c07f0ae144ebe6916b28c40ca22b94 Mon Sep 17 00:00:00 2001 From: Moe Date: Sun, 29 Jan 2023 20:10:34 -0800 Subject: [PATCH] make s.readFile fs.readFile promise instead --- libs/monitor.js | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/libs/monitor.js b/libs/monitor.js index 284d63ac..bd0c6f86 100644 --- a/libs/monitor.js +++ b/libs/monitor.js @@ -74,16 +74,14 @@ module.exports = function(s,config,lang){ s.getMonitorCpuUsage = function(e,callback){ if(s.group[e.ke].activeMonitors[e.mid] && s.group[e.ke].activeMonitors[e.mid].spawn){ const getUsage = function(callback2){ - s.readFile("/proc/" + s.group[e.ke].activeMonitors[e.mid].spawn.pid + "/stat", function(err, data){ - if(!err){ - const elems = data.toString().split(' '); - const utime = parseInt(elems[13]); - const stime = parseInt(elems[14]); - - callback2(utime + stime); - }else{ - clearInterval(0) - } + fs.promises.readFile("/proc/" + s.group[e.ke].activeMonitors[e.mid].spawn.pid + "/stat").then((data) => { + const elems = data.toString().split(' '); + const utime = parseInt(elems[13]); + const stime = parseInt(elems[14]); + callback2(utime + stime); + }).catch((err) => { + s.debugLog(err) + clearInterval(0) }) } getUsage(function(startTime){ @@ -271,15 +269,13 @@ module.exports = function(s,config,lang){ } }) }else{ - s.readFile(streamDir + 's.jpg',function(err,snapBuffer){ - if(err){ - sendTempImage() - }else{ - resolve({ - screenShot: snapBuffer, - isStaticFile: true - }) - } + fs.promises.readFile(streamDir + 's.jpg').then(function(snapBuffer){ + resolve({ + screenShot: snapBuffer, + isStaticFile: true + }) + }).catch(() => { + sendTempImage() }) } })