diff options
| author | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-05-05 20:48:16 +0530 |
|---|---|---|
| committer | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-05-05 20:48:16 +0530 |
| commit | b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80 (patch) | |
| tree | 74234775d723e33378059f2fa45fa80e3bc6ac43 /include/delivery.php | |
| parent | 214ec91a3f2c5fec6cced93f669b3a9725f0e40a (diff) | |
| parent | 8ae83201cf8f3c943972a8f246b7972aa640afb4 (diff) | |
| download | volse-hubzilla-b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80.tar.gz volse-hubzilla-b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80.tar.bz2 volse-hubzilla-b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80.zip | |
Merge branch 'master' of git://github.com/friendica/friendica
Diffstat (limited to 'include/delivery.php')
| -rw-r--r-- | include/delivery.php | 11 |
1 files changed, 11 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", |