ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make s.readFile fs.readFile promise instead

matrix-notifications^2
Moe 2023-01-29 20:10:34 -08:00
parent 17931776ac
commit 9c95f8ea04
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libs/monitor.js
View File

@ -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()
})
}
})