Merge pull request #226 from andrewbrereton/patch-1

gethostname() doesn't work on Amazon's EC2
This commit is contained in:
Chris Boulton 2016-10-11 12:11:19 -07:00 committed by GitHub
commit 3cead7dbb6

View File

@ -71,13 +71,8 @@ class Resque_Worker
} }
$this->queues = $queues; $this->queues = $queues;
if(function_exists('gethostname')) { $this->hostname = php_uname('n');
$hostname = gethostname();
}
else {
$hostname = php_uname('n');
}
$this->hostname = $hostname;
$this->id = $this->hostname . ':'.getmypid() . ':' . implode(',', $this->queues); $this->id = $this->hostname . ':'.getmypid() . ':' . implode(',', $this->queues);
} }