Handle a nil argument to Einhorn::Worker.socket

contribsys · Sep 27, 2012 · 8beadcf · 8beadcf
1 parent d83384c
commit 8beadcf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/History.txt b/History.txt
@@ -1,3 +1,7 @@
+=== 0.4.1 2012-09-27
+
+* Handle a nil argument to Einhorn::Worker.socket
+
 === 0.4.0 2012-09-26
 
 * Switch the command-socket protocol from line-oriented JSON to

diff --git a/lib/einhorn/worker.rb b/lib/einhorn/worker.rb
@@ -78,12 +78,15 @@ def self.ack!(discovery=:env, arg=nil)
       true
     end
 
-    def self.socket(number=0)
+    def self.socket(number=nil)
+      number ||= 0
       fds = einhorn_fds
       fds ? fds[number] : nil
     end
 
-    def self.socket!(number=0)
+    def self.socket!(number=nil)
+      number ||= 0
+
       unless fds = einhorn_fds
         raise "No EINHORN_FDS provided in environment. Are you running under Einhorn?"
       end