Merge pull request #180 from dereuromark/bugfix/timeout

PHP timeout fix.

Author: dereuromark

config/app_queue.php

@@ -22,6 +22,9 @@
 		// seconds of running time after which the worker will terminate (0 = unlimited)
 		'workermaxruntime' => 120,
 
+		// seconds of running time after which the PHP process will terminate, null uses workermaxruntime * 100
+		'workertimeout' => null,
+
 		// minimum time (in seconds) which a task remains in the database before being cleaned up.
 		'cleanuptimeout' => 3600,
 

src/Shell/QueueShell.php

@@ -145,8 +145,7 @@ public function runworker() {
 		$types = $this->_stringToArray($this->param('type'));
 
 		while (!$this->_exit) {
-			// make sure accidental overriding isnt possible
-			set_time_limit(0);
+			$this->_setPhpTimeout();
 
 			try {
 				$this->_updatePid($pid);
@@ -633,4 +632,18 @@ protected function _stringToArray($param) {
 		return array_filter($array);
 	}
 
+	/**
+	 * Makes sure accidental overriding isn't possible, uses workermaxruntime times 100 by default.
+	 *
+	 * @return void
+	 */
+	protected function _setPhpTimeout() {
+		$timeLimit = (int)Configure::read('Queue.workermaxruntime') * 100;
+		if (Configure::read('Queue.workertimeout') !== null) {
+			$timeLimit = (int)Configure::read('Queue.workertimeout');
+		}
+
+		set_time_limit($timeLimit);
+	}
+
 }