Merge pull request #290 from luishdez/master

Fix OSX worker warning and cli_set_process_title
This commit is contained in:
Chris Boulton 2016-07-14 18:21:10 +10:00 committed by GitHub
commit ab07fda51c

View File

@ -63,7 +63,7 @@ class Resque_Worker
public function __construct($queues) public function __construct($queues)
{ {
$this->logger = new Resque_Log(); $this->logger = new Resque_Log();
if(!is_array($queues)) { if(!is_array($queues)) {
$queues = array($queues); $queues = array($queues);
} }
@ -327,7 +327,7 @@ class Resque_Worker
private function updateProcLine($status) private function updateProcLine($status)
{ {
$processTitle = 'resque-' . Resque::VERSION . ': ' . $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); cli_set_process_title($processTitle);
} }
else if(function_exists('setproctitle')) { else if(function_exists('setproctitle')) {