implement max load average before queuing/deferring delivery and poller processes

2 files changed, 24 insertions, 0 deletions

diff --git a/include/delivery.php b/include/delivery.php
index 794b8f27a..28d81226a 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -51,6 +51,17 @@ function delivery_run($argv, $argc){
 		return;
 	}	
 
+	$maxsysload = intval(get_config('system','maxloadavg'));
+	if($maxsysload < 1)
+		$maxsysload = 50;
+	if(function_exists('sys_getloadavg')) {
+		$load = sys_getloadavg();
+		if(intval($load[0]) > $maxsysload) {
+			logger('system: load ' . $load . ' too high. Delivery deferred to next queue run.');
+			return;
+		}
+	}
+
 	// It's ours to deliver. Remove it from the queue.
 
 	q("delete from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
diff --git a/include/poller.php b/include/poller.php
index 0a0e66b86..f6553c846 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -30,6 +30,17 @@ function poller_run($argv, $argc){
 	load_config('config');
 	load_config('system');
 
+	$maxsysload = intval(get_config('system','maxloadavg'));
+	if($maxsysload < 1)
+		$maxsysload = 50;
+	if(function_exists('sys_getloadavg')) {
+		$load = sys_getloadavg();
+		if(intval($load[0]) > $maxsysload) {
+			logger('system: load ' . $load . ' too high. Poller deferred to next scheduled run.');
+			return;
+		}
+	}
+
 	$lockpath = get_config('system','lockpath');
 	if ($lockpath != '') {
 		$pidfile = new pidfile($lockpath, 'poller.lck');
@@ -39,6 +50,8 @@ function poller_run($argv, $argc){
 		}
 	}
 
+
+
 	$a->set_baseurl(get_config('system','url'));
 
 	load_hooks();