Merge pull request #39 from halorgium/cleanup-guards

Server#finalize fails if the socket was unable to be created
celluloid · Apr 7, 2013 · 86044e1 · 86044e1
2 parents ae610ec + c28fb1a
commit 86044e1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/reel/app.rb b/lib/reel/app.rb
@@ -27,7 +27,7 @@ def status_symbol(status)
     end
 
     def terminate
-      @server.terminate
+      @server.terminate if @server
     end
   end
 end
diff --git a/lib/reel/server.rb b/lib/reel/server.rb
@@ -17,7 +17,7 @@ def initialize(host, port, backlog = DEFAULT_BACKLOG, &callback)
     end
 
     def finalize
-      @server.close
+      @server.close if @server
     end
 
     def run

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -15,7 +15,7 @@ def with_reel(handler)
   server = Reel::Server.new(example_addr, example_port, &handler)
   yield server
 ensure
-  server.terminate
+  server.terminate if server
 end
 
 def with_socket_pair