We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 8acf930c authored by mattl's avatar mattl

OpportunisticQM matches against _system_ max_execution_time

Probably never runs if max_execution_time is 0. I'll handle that later.
parent b13f8df7
......@@ -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;
......@@ -45,7 +45,7 @@ class OpportunisticQueueManager extends DBQueueManager
}
if ($this->max_execution_margin === null) {
$this->max_execution_margin = 10; // should be calculated from our default timeouts for http requests etc.
$this->max_execution_margin = 10; // think PHP's max exec time, minus this value to have time for timeouts etc.
}
return parent::__construct();
......@@ -67,7 +67,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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment