- fixed some things from previous commits

Marius Burkard · Marius Burkard · commit e06b59c893c0 · 2016-02-18T11:24:49.000+01:00
diff --git a/server/lib/classes/cron.d/100-monitor_database_size.inc.php b/server/lib/classes/cron.d/100-monitor_database_size.inc.php
@@ -92,14 +92,16 @@ public function onRunJob() {
 				$data[$i]['sys_groupid'] = $rec['sys_groupid'];
 
 				$quota = $rec['database_quota'] * 1024 * 1024;
-				if (!is_numeric($quota)) continue;
+				if(!is_numeric($quota)) continue;
 				
-				if($quota < 0 || $quota > $data[$i]['size']) {
+				if($quota < 1 || $quota > $data[$i]['size']) {
+					print $rec['database_name'] . ' does not exceed quota qize: ' . $quota . ' > ' . $data[$i]['size'] . "\n";
 					if($rec['quota_exceeded'] == 'y') {
 						$app->dbmaster->datalogUpdate('web_database', array('quota_exceeded' => 'n'), 'database_id', $rec['database_id']);
 					}
 				} elseif($rec['quota_exceeded'] == 'n') {
-						$app->dbmaster->datalogUpdate('web_database', array('quota_exceeded' => 'y'), 'database_id', $rec['database_id']);
+					print $rec['database_name'] . ' exceeds quota qize: ' . $quota . ' < ' . $data[$i]['size'] . "\n";
+					$app->dbmaster->datalogUpdate('web_database', array('quota_exceeded' => 'y'), 'database_id', $rec['database_id']);
 				}
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -92,14 +92,16 @@ public function onRunJob() {`
`92`	`92`	`$data[$i]['sys_groupid'] = $rec['sys_groupid'];`
`93`	`93`
`94`	`94`	`$quota = $rec['database_quota'] * 1024 * 1024;`
`95`		`- if (!is_numeric($quota)) continue;`
	`95`	`+ if(!is_numeric($quota)) continue;`
`96`	`96`
`97`		`- if($quota < 0 \|\| $quota > $data[$i]['size']) {`
	`97`	`+ if($quota < 1 \|\| $quota > $data[$i]['size']) {`
	`98`	`+ print $rec['database_name'] . ' does not exceed quota qize: ' . $quota . ' > ' . $data[$i]['size'] . "\n";`
`98`	`99`	`if($rec['quota_exceeded'] == 'y') {`
`99`	`100`	`$app->dbmaster->datalogUpdate('web_database', array('quota_exceeded' => 'n'), 'database_id', $rec['database_id']);`
`100`	`101`	`}`
`101`	`102`	`} elseif($rec['quota_exceeded'] == 'n') {`
`102`		`- $app->dbmaster->datalogUpdate('web_database', array('quota_exceeded' => 'y'), 'database_id', $rec['database_id']);`
	`103`	`+ print $rec['database_name'] . ' exceeds quota qize: ' . $quota . ' < ' . $data[$i]['size'] . "\n";`
	`104`	`+ $app->dbmaster->datalogUpdate('web_database', array('quota_exceeded' => 'y'), 'database_id', $rec['database_id']);`
`103`	`105`	`}`
`104`	`106`	`}`
`105`	`107`