Skip to content

Avoid dashboard crash on macOS when SMC data is unavailable. #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sherbondy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Avoid dashboard crash on macOS when SMC data is unavailable. #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 32 additions & 29 deletions miner/dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,43 +785,46 @@ class CLIDashboard{

let parts = smcData.split('**** SMC sensors ****')[1];
let isSMCDone = false
parts.split('\n').map(line=>{
if(line.indexOf('****') >= 0 || isSMCDone){
//section is done
isSMCDone = true;
return false;
}
if(line.indexOf('GPU') == 0){
if(line.indexOf('temperature') >= 0){
//is temp
if (parts !== undefined) {
parts.split('\n').map(line=>{
if(line.indexOf('****') >= 0 || isSMCDone){
//section is done
isSMCDone = true;
return false;
}
if(line.indexOf('GPU') == 0){
if(line.indexOf('temperature') >= 0){
//is temp
if(typeof this.gpus != "undefined"){
Object.keys(this.gpus).map(key=>{
let gpuD = this.gpus[key];
let tempD = {temperature:parseFloat(line.split(':')[1].replace('C','').trim()),time:moment().format('HH:mm')};

/*console.log('');
console.log('tempD',tempD)*/
this.gpus[key].data.temperature.push(tempD);
})
}
}

}
if(line.indexOf('Fan') >= 0){
//its the fan speed
let fanSpeed = line.split(':')[1].replace('rpm','').trim();
if(typeof this.gpus != "undefined"){
Object.keys(this.gpus).map(key=>{
let gpuD = this.gpus[key];
let tempD = {temperature:parseFloat(line.split(':')[1].replace('C','').trim()),time:moment().format('HH:mm')};

let fanD = {fans:Math.floor(parseFloat(fanSpeed)/6200*100),time:moment().format('HH:mm')};
//console.log('fan data isset',fanD);
/*console.log('');
console.log('tempD',tempD)*/
this.gpus[key].data.temperature.push(tempD);
this.gpus[key].data.fan.push(fanD);
})
}
}

}
if(line.indexOf('Fan') >= 0){
//its the fan speed
let fanSpeed = line.split(':')[1].replace('rpm','').trim();
if(typeof this.gpus != "undefined"){
Object.keys(this.gpus).map(key=>{
let gpuD = this.gpus[key];
let fanD = {fans:Math.floor(parseFloat(fanSpeed)/6200*100),time:moment().format('HH:mm')};
//console.log('fan data isset',fanD);
/*console.log('');
console.log('tempD',tempD)*/
this.gpus[key].data.fan.push(fanD);
})
}
}
});
});
}

let powerParts = smcData.split('**** Processor usage ****')[1].split('\n');
let hasFoundPowerPart = 0;
let powerW = 0;
Expand Down