]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Did the OpportunisticQM fixes in the wrong order upstream-master
authorMikael Nordfeldth <mmn@hethane.se>
Mon, 11 Jan 2016 12:35:29 +0000 (13:35 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Fri, 22 Jan 2016 11:26:53 +0000 (12:26 +0100)
plugins/OpportunisticQM/lib/opportunisticqueuemanager.php

index 7100ab72965a1bd81fe8e995b4bd1499a75530f7..2834b9a0ee849af228922d4dc65beb5546e50432 100644 (file)
@@ -18,7 +18,7 @@ class OpportunisticQueueManager extends DBQueueManager
 {
     protected $qmkey = false;
     protected $max_execution_time = null;
-    protected $max_execution_margin = null; // margin to execution time, including timeouts etc.
+    protected $max_execution_margin = null; // margin to PHP's max_execution_time
     protected $max_queue_items = null;
 
     protected $started_at = null;
@@ -65,7 +65,7 @@ class OpportunisticQueueManager extends DBQueueManager
             return false;
         }
         // If too much time has passed, stop
-        if ($time_passed >= $this->max_execution_time - $this->max_execution_margin) {
+        if ($time_passed >= $this->max_execution_time || $time_passed > ini_get('max_execution_time') - $this->max_execution_margin) {
             return false;
         }
         // If we have a max-item-limit, check if it has been passed