Merge pull request #290 from luishdez/master

chrisboulton · web-flow · commit ab07fda51c29 · 2016-07-14T18:21:10.000+10:00
Fix OSX worker warning and cli_set_process_title
diff --git a/lib/Resque/Worker.php b/lib/Resque/Worker.php
@@ -63,7 +63,7 @@ class Resque_Worker
     public function __construct($queues)
     {
         $this->logger = new Resque_Log();
-        
+
         if(!is_array($queues)) {
             $queues = array($queues);
         }
@@ -327,7 +327,7 @@ private function startup()
 	private function updateProcLine($status)
 	{
 		$processTitle = 'resque-' . Resque::VERSION . ': ' . $status;
-		if(function_exists('cli_set_process_title')) {
+		if(function_exists('cli_set_process_title') && PHP_OS !== 'Darwin') {
 			cli_set_process_title($processTitle);
 		}
 		else if(function_exists('setproctitle')) {

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ class Resque_Worker`
`63`	`63`	`public function __construct($queues)`
`64`	`64`	`{`
`65`	`65`	`$this->logger = new Resque_Log();`
`66`		`-`
	`66`	`+`
`67`	`67`	`if(!is_array($queues)) {`
`68`	`68`	`$queues = array($queues);`
`69`	`69`	`}`
`@@ -327,7 +327,7 @@ private function startup()`
`327`	`327`	`private function updateProcLine($status)`
`328`	`328`	`{`
`329`	`329`	`$processTitle = 'resque-' . Resque::VERSION . ': ' . $status;`
`330`		`- if(function_exists('cli_set_process_title')) {`
	`330`	`+ if(function_exists('cli_set_process_title') && PHP_OS !== 'Darwin') {`
`331`	`331`	`cli_set_process_title($processTitle);`
`332`	`332`	`}`
`333`	`333`	`else if(function_exists('setproctitle')) {`