Parity operation enhancements

This commit is contained in:
bergware
2022-02-09 05:52:12 +01:00
parent 5bf4a331f9
commit 2db8c045c4
+23 -16
View File
@@ -347,38 +347,45 @@ while (true) {
$frmt = $display['date'].($display['date']!='%c' ? ", {$display['time']}" : "");
$idle = $var['mdResync']==0;
if ($var['sbSyncExit']!=0) {
$echo[4] = sprintf(_('Last check incomplete on **%s**'),_(my_time($var['sbSynced2']).day_count($var['sbSynced2']),0)).'<br>'.sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0');
$echo[4] .= " <i class='fa fa-fw fa-dot-circle-o'></i> "._('Error code').": ".my_error($var['sbSyncExit']);
$echo[4] = sprintf(_('Last check incomplete on **%s**'),_(my_time($var['sbSynced2']).day_count($var['sbSynced2']),0));
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0');
$echo[4].= "<br><i class='fa fa-fw fa-dot-circle-o'></i> "._('Error code').": ".my_error($var['sbSyncExit']);
} elseif ($var['sbSynced']==0) {
[$date,$duration,$speed,$status,$error,$action] = last_parity_log();
if (!$date) {
$echo[4] = _('Parity has not been checked yet');
} elseif ($status==0) {
$echo[4] = sprintf(_('Last checked on **%s**'),_(my_time($date).day_count($date),0)).'<br> '.sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
$echo[4] .= " <i class='fa fa-fw fa-clock-o'></i> "._('Duration').": ".my_check($duration,$speed);
$echo[4] = sprintf(_('Last checked on **%s**'),_(my_time($date).day_count($date),0));
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
$echo[4].= "<br><i class='fa fa-fw fa-clock-o'></i> "._('Duration').": ".my_check($duration,$speed);
} else {
$echo[4] = sprintf(_('Last check incomplete on **%s**'),_(my_time($date).day_count($date),0)).'<br>'.sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
$echo[4] .= " <i class='fa fa-fw fa-dot-circle-o'></i> "._('Error code').": ".my_error($status);
$echo[4] = sprintf(_('Last check incomplete on **%s**'),_(my_time($date).day_count($date),0));
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
$echo[4].= "<br><i class='fa fa-fw fa-dot-circle-o'></i> "._('Error code').": ".my_error($status);
}
} elseif ($var['sbSynced2']==0) {
if ($idle) {
[$date,$duration,$speed,$status,$error,$action] = my_explode('|', read_parity_log($var['sbSynced'],!$idle),6);
if ($status==0) {
$echo[4] = sprintf(_('Last checked on **%s**'),_(my_time($var['sbSynced']).day_count($var['sbSynced']),0)).'<br>'.sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
$echo[4] .= " <i class='fa fa-fw fa-clock-o'></i> "._('Duration').": ".my_check($duration,$speed);
$echo[4] = sprintf(_('Last checked on **%s**'),_(my_time($var['sbSynced']).day_count($var['sbSynced']),0));
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
$echo[4].= "<br><i class='fa fa-fw fa-clock-o'></i> "._('Duration').": ".my_check($duration,$speed);
} else {
$echo[4] = sprintf(_('Last check incomplete on **%s**'),_(my_time($var['sbSynced']).day_count($var['sbSynced']),0)).'<br>'.sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
$echo[4] .= " <i class='fa fa-fw fa-dot-circle-o'></i> "._('Error code').": ".my_error($status);
$echo[4] = sprintf(_('Last check incomplete on **%s**'),_(my_time($var['sbSynced']).day_count($var['sbSynced']),0));
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
$echo[4].= "<br><i class='fa fa-fw fa-dot-circle-o'></i> "._('Error code').": ".my_error($status);
}
} else {
$echo[4] = sprintf(_('Current operation %s on **%s**'),($var['mdResync']?_('started'):_('paused')),_(my_time($var['sbUpdated']).day_count($var['sbSynced']),0)).'<br>'.sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0');
$echo[4] .= "<br><i class='fa fa-fw fa-clock-o'></i> "._('Elapsed time').": "._(my_clock(floor((time()-$var['sbUpdated'])/60)),2);
$echo[4] .= "<br><i class='fa fa-fw fa-flag-checkered'></i> "._('Estimated finish').': '._(my_clock(round(((($var['mdResyncDt']*(($var['mdResync']-$var['mdResyncPos'])/($var['mdResyncDb']/100+1)))/100)/60),0)),2);
$echo[4] = sprintf(_('Current operation %s on **%s**'),($var['mdResync']?_('started'):_('paused')),_(my_time($var['sbUpdated']).day_count($var['sbSynced']),0));
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0');
$echo[4].= "<br><i class='fa fa-fw fa-clock-o'></i> "._('Elapsed time').": "._(my_clock(floor((time()-$var['sbUpdated'])/60)),2);
$echo[4].= "<br><i class='fa fa-fw fa-flag-checkered'></i> "._('Estimated finish').': '._(my_clock(round(((($var['mdResyncDt']*(($var['mdResync']-$var['mdResyncPos'])/($var['mdResyncDb']/100+1)))/100)/60),0)),2);
}
} else {
[$date,$duration,$speed,$status,$error,$action] = last_parity_log();
$echo[4] = sprintf(_('Last check completed on **%s**'),_(my_time($var['sbSynced2']).day_count($var['sbSynced2']),0)).'<br>'.sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0');
$echo[4] .= " <i class='fa fa-fw fa-clock-o'></i> "._('Duration').': '.my_check($duration,$speed);
$echo[4] = sprintf(_('Last check completed on **%s**'),_(my_time($var['sbSynced2']).day_count($var['sbSynced2']),0));
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0');
$echo[4].= "<br><i class='fa fa-fw fa-clock-o'></i> "._('Duration').': '.my_check($duration,$speed);
}
if ($idle) {
[$m,$h] = explode(' ', $parity['hour']);
@@ -448,7 +455,7 @@ while (true) {
$echo[4] .= sprintf(_('Next check scheduled on **%s**'),_(strftime($frmt,$time+$t),0));
$echo[4] .= "<br><i class='fa fa-fw fa-clock-o'></i> "._('Due in').": "._(my_clock(floor($t/60)),2);
} else {
$echo[4] .= "<i class='fa fa-warning'></i> "._('Scheduled parity check is disabled');
$echo[4] .= "<i class='fa fa-search'></i> "._('Scheduled parity check is disabled');
}
} else {
$echo[4] .= "\0";