Merge pull request chrisboulton#226 from andrewbrereton/patch-1

chrisboulton · web-flow · commit 3cead7dbb60a · 2016-10-11T12:11:19.000-07:00
gethostname() doesn't work on Amazon's EC2
diff --git a/lib/Resque/Worker.php b/lib/Resque/Worker.php
@@ -71,13 +71,8 @@ public function __construct($queues)
         }
 
         $this->queues = $queues;
-        if(function_exists('gethostname')) {
-            $hostname = gethostname();
-        }
-        else {
-            $hostname = php_uname('n');
-        }
-        $this->hostname = $hostname;
+        $this->hostname = php_uname('n');
+
         $this->id = $this->hostname . ':'.getmypid() . ':' . implode(',', $this->queues);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -71,13 +71,8 @@ public function __construct($queues)`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`$this->queues = $queues;`
`74`		`- if(function_exists('gethostname')) {`
`75`		`- $hostname = gethostname();`
`76`		`- }`
`77`		`- else {`
`78`		`- $hostname = php_uname('n');`
`79`		`- }`
`80`		`- $this->hostname = $hostname;`
	`74`	`+ $this->hostname = php_uname('n');`
	`75`	`+`
`81`	`76`	`$this->id = $this->hostname . ':'.getmypid() . ':' . implode(',', $this->queues);`
`82`	`77`	`}`
`83`	`78`