bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-26 05:20:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

health controller fixes

Browse Source
This commit is contained in:
SJ 2013-04-30 15:59:04 +02:00
parent a15b75e165
commit 47f72bddbb
1 changed files with 52 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
webui/controller/health/worker.php
View File

@ -8,6 +8,7 @@ class ControllerHealthWorker extends Controller {
$archivesizeraw = $sqlsizeraw = $sphinxsizeraw = 0; $archivesizeraw = $sqlsizeraw = $sphinxsizeraw = 0;
$averagemessagesweekraw = $averagemessagesmonthraw = $averagemessagesizeraw = $averagesizedayraw = $averagesqlsizeraw = $averagesphinxsizeraw = 0; $averagemessagesweekraw = $averagemessagesmonthraw = $averagemessagesizeraw = $averagesizedayraw = $averagesqlsizeraw = $averagesphinxsizeraw = 0;
$averagemessagestotalraw = 0;
$this->id = "content"; $this->id = "content";
$this->template = "health/worker.tpl"; $this->template = "health/worker.tpl";
@ -48,16 +49,6 @@ class ControllerHealthWorker extends Controller {
list($this->data['totalmem'], $this->data['meminfo'], $this->data['totalswap'], $this->data['swapinfo']) = $this->model_health_health->meminfo(); list($this->data['totalmem'], $this->data['meminfo'], $this->data['totalswap'], $this->data['swapinfo']) = $this->model_health_health->meminfo();
$this->data['shortdiskinfo'] = $this->model_health_health->diskinfo(); $this->data['shortdiskinfo'] = $this->model_health_health->diskinfo();
if(ENABLE_LDAP_IMPORT_FEATURE == 1) {
$this->data['adsyncinfo'] = @file_get_contents(AD_SYNC_STAT);
$this->data['total_emails_in_database'] = 0;
$a = preg_split("/ /", $this->data['adsyncinfo']);
list ($this->data['totalusers'], $this->data['totalnewusers'], $this->data['totaldeletedusers'], $this->data['total_emails_in_database']) = preg_split("/\//", $a[count($a)-1]);
$this->data['adsyncinfo'] = $a[0] . " " . $a[1] . " " . $this->data['total_emails_in_database'];
}
/* counter related stuff */ /* counter related stuff */
@ -82,16 +73,42 @@ class ControllerHealthWorker extends Controller {
$sphinxsizeraw = $this->model_health_health->get_sphinx_size(); $sphinxsizeraw = $this->model_health_health->get_sphinx_size();
/* message count variables */
$averagemessagesweekraw = ($this->data['processed_emails'][1]) / 7; //average messages per day, computed over the past week
$averagemessagesmonthraw = ($this->data['processed_emails'][2]) / 30; //average messages per day, computed over the past month
$averagemessagestotalraw = ($this->data['counters']['rcvd']) / $total_number_days; //average messages per day, computed over the time period since the first email was archived
/* message size variables */ /*
$averagemessagesizeraw = $archivesizeraw / $this->data['counters']['rcvd']; //average message size, computed for total messages in database * message count variables
$averagesqlsizeraw = $sqlsizeraw / $this->data['counters']['rcvd']; //average message metadata size, computed for total messages in database */
$averagesphinxsizeraw = $sphinxsizeraw / $this->data['counters']['rcvd']; //average message sphinx index size, computed for total messages in database
$averagesizedayraw = ($averagemessagesizeraw+$averagesqlsizeraw+$averagesphinxsizeraw) * $averagemessagestotalraw; //average total message size per day, computed over the time period since the first email was archived //average messages per day, computed over the past week
$averagemessagesweekraw = ($this->data['processed_emails'][1]) / 7;
//average messages per day, computed over the past month
$averagemessagesmonthraw = ($this->data['processed_emails'][2]) / 30;
//average messages per day, computed over the time period since the first email was archived
if($total_number_days > 0) { $averagemessagestotalraw = ($this->data['counters']['rcvd']) / $total_number_days; }
/*
* message size variables
*/
if($this->data['counters']['rcvd'] > 0) {
//average message size, computed for total messages in database
$averagemessagesizeraw = $archivesizeraw / $this->data['counters']['rcvd'];
//average message metadata size, computed for total messages in database
$averagesqlsizeraw = $sqlsizeraw / $this->data['counters']['rcvd'];
//average message sphinx index size, computed for total messages in database
$averagesphinxsizeraw = $sphinxsizeraw / $this->data['counters']['rcvd'];
}
//average total message size per day, computed over the time period since the first email was archived
$averagesizedayraw = ($averagemessagesizeraw + $averagesqlsizeraw + $averagesphinxsizeraw) * $averagemessagestotalraw;
$datapart = 0; $datapart = 0;
foreach($this->data['shortdiskinfo'] as $part) { foreach($this->data['shortdiskinfo'] as $part) {
@ -104,8 +121,18 @@ class ControllerHealthWorker extends Controller {
$this->data['averagesqlsize'] = nice_size($averagesqlsizeraw,' '); // formatted average metadata size in sql $this->data['averagesqlsize'] = nice_size($averagesqlsizeraw,' '); // formatted average metadata size in sql
$this->data['averagesphinxsize'] = nice_size($averagesphinxsizeraw,' '); // formatted average sphinx index $this->data['averagesphinxsize'] = nice_size($averagesphinxsizeraw,' '); // formatted average sphinx index
$this->data['averagesizeday'] = nice_size($averagesizedayraw,' '); // formatted average size per day $this->data['averagesizeday'] = nice_size($averagesizedayraw,' '); // formatted average size per day
$this->data['daysleftatcurrentrate'] = convert_days_ymd($datapart / $averagesizedayraw); // estimated number of days of free space left
if ( $averagemessagesweekraw > $averagemessagesmonthraw ) { // determine if the trend of the last week compared to the last month is increasing, decreasing, or neutral (only applies to message count, not size) // estimated number of days of free space left
$averagesizedayraw > 0 ? $this->data['daysleftatcurrentrate'] = convert_days_ymd($datapart / $averagesizedayraw) : $this->data['daysleftatcurrentrate'] = 0;
/*
* determine if the trend of the last week compared to the last month is
* increasing, decreasing, or neutral
* (only applies to message count, not size)
*/
if ( $averagemessagesweekraw > $averagemessagesmonthraw ) {
$this->data['usagetrend'] = 1; $this->data['usagetrend'] = 1;
} elseif( $averagemessagesweekraw < $averagemessagesmonthraw ) { } elseif( $averagemessagesweekraw < $averagemessagesmonthraw ) {
$this->data['usagetrend'] = -1; $this->data['usagetrend'] = -1;