Skip to content

Commit df7d910

Browse files
committed
Merge 'M2Mobi/worker_process_queues_name' into old-pulls
Closes chrisboulton/php-resque#346
2 parents aed4d1f + 981ef3d commit df7d910

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lib/Resque/Worker.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,9 @@ public function work($interval = Resque::DEFAULT_INTERVAL, $blocking = false)
192192
if(!$this->paused) {
193193
if($blocking === true) {
194194
$this->logger->log(Psr\Log\LogLevel::INFO, 'Starting blocking with timeout of {interval}', array('interval' => $interval));
195-
$this->updateProcLine('Waiting for ' . implode(',', $this->queues) . ' with blocking timeout ' . $interval);
195+
$this->updateProcLine('Waiting with blocking timeout ' . $interval);
196196
} else {
197-
$this->updateProcLine('Waiting for ' . implode(',', $this->queues) . ' with interval ' . $interval);
197+
$this->updateProcLine('Waiting with interval ' . $interval);
198198
}
199199

200200
$job = $this->reserve($blocking, $interval);
@@ -214,7 +214,7 @@ public function work($interval = Resque::DEFAULT_INTERVAL, $blocking = false)
214214
$this->updateProcLine('Paused');
215215
}
216216
else {
217-
$this->updateProcLine('Waiting for ' . implode(',', $this->queues));
217+
$this->updateProcLine('Waiting');
218218
}
219219

220220
usleep($interval * 1000000);
@@ -390,7 +390,7 @@ private function startup()
390390
*/
391391
private function updateProcLine($status)
392392
{
393-
$processTitle = static::$processPrefix . '-' . Resque::VERSION . ': ' . $status;
393+
$processTitle = static::$processPrefix . '-' . Resque::VERSION . ' (' . implode(',', $this->queues) . '): ' . $status;
394394
if(function_exists('cli_set_process_title') && PHP_OS !== 'Darwin') {
395395
cli_set_process_title($processTitle);
396396
}

0 commit comments

Comments
 (0)