Added new 'fsProgress' string to footer. No more logging of text to progressFrame.

Also fixed bug generating parity sync type text.
Also removed stupid comment I put in diskload script some time ago.
This commit is contained in:
Tom Mortensen
2017-07-05 23:12:32 -07:00
parent 95bfa90175
commit 2b87e51534
2 changed files with 7 additions and 6 deletions

View File

@@ -503,7 +503,7 @@ $(function() {
var watchdog = new NchanSubscriber('/sub/var');
watchdog.on('message', function(data){
var ini=parseINI(data);
var status;
var status, progress;
if (ini['fsState']=="Stopped") {
status="<span class='red strong'>Array Stopped</span>";
}else if (ini['fsState']=="Starting") {
@@ -512,14 +512,16 @@ $(function() {
status="<span class='green strong'>Array Started</span>";
if (ini['mdResync'] > 0) {
var action;
if (ini['mdResyncAction'].indexOf("recon")) action="Parity-Sync / Data-Rebuild";
else if (ini['mdResyncAction'].indexOf("clear")) action="Clearing";
else if (ini['mdResyncAction'] == "check") action="Read-Check";
else if (ini['mdResyncAction'].indexOf("check")) action="Parity-Check";
if (ini['mdResyncAction'].indexOf("recon")>=0) action="Parity-Sync / Data-Rebuild";
else if (ini['mdResyncAction'].indexOf("clear")>=0) action="Clearing";
else if (ini['mdResyncAction'] == "check") action="Read-Check";
else if (ini['mdResyncAction'].indexOf("check")>=0) action="Parity-Check";
action += " " + (ini['mdResyncPos']/(ini['mdResync']/100+1)).toFixed(1) + " %";
status += "&bullet;<span class='orange strong'>"+action+"</span>";
}
}
if (ini['fsProgress'].length)
status += "&bullet;<span class='green strong'>"+ini['fsProgress']+"</span>";
$('#statusbar').html(status);
});
watchdog.start();

View File

@@ -1,5 +1,4 @@
#!/bin/bash
# todo: this should generate/publish json-encoded string
ini=/var/local/emhttp/diskload.ini
declare -a sector reads writes