Merge pull request #131 from richardkmiller/updateProcLine-php5.5

chrisboulton · chrisboulton · commit 7f2cba1553e9 · 2013-09-06T18:03:51.000-07:00
Let Resque_Worker::updateProcLine() use PHP 5.5's cli_set_process_title() if available
diff --git a/lib/Resque/Worker.php b/lib/Resque/Worker.php
@@ -324,8 +324,12 @@ private function startup()
 	 */
 	private function updateProcLine($status)
 	{
-		if(function_exists('setproctitle')) {
-			setproctitle('resque-' . Resque::VERSION . ': ' . $status);
+		$processTitle = 'resque-' . Resque::VERSION . ': ' . $status;
+		if(function_exists('cli_set_process_title')) {
+			cli_set_process_title($processTitle);
+		}
+		else if(function_exists('setproctitle')) {
+			setproctitle($processTitle);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -324,8 +324,12 @@ private function startup()`
`324`	`324`	`*/`
`325`	`325`	`private function updateProcLine($status)`
`326`	`326`	`{`
`327`		`- if(function_exists('setproctitle')) {`
`328`		`- setproctitle('resque-' . Resque::VERSION . ': ' . $status);`
	`327`	`+ $processTitle = 'resque-' . Resque::VERSION . ': ' . $status;`
	`328`	`+ if(function_exists('cli_set_process_title')) {`
	`329`	`+ cli_set_process_title($processTitle);`
	`330`	`+ }`
	`331`	`+ else if(function_exists('setproctitle')) {`
	`332`	`+ setproctitle($processTitle);`
`329`	`333`	`}`
`330`	`334`	`}`
`331`	`335`