Merge pull request postrank-labs#86 from nviennot/master

igrigorik · igrigorik · commit 7c75589a3c81 · 2011-09-20T00:41:54.000-07:00
EM.epoll *must* be called before EM.run
diff --git a/lib/goliath/server.rb b/lib/goliath/server.rb
@@ -69,12 +69,11 @@ def initialize(address = DEFAULT_ADDRESS, port = DEFAULT_PORT)
 #
 # @return Does not return until the server has halted.
 def start(&blk)
+ EM.epoll
 EM.synchrony do
 trap("INT"){EM.stop }
 trap("TERM"){EM.stop }
 
- EM.epoll
-
 load_config(options[:config])
 load_plugins
 

-Original file line number
+Diff line change
+#
 # @return Does not return until the server has halted.
 defstart(&blk)
 +EM.epoll
 EM.synchronydo
 trap("INT"){EM.stop}
 trap("TERM"){EM.stop}
 -EM.epoll
+-
 load_config(options[:config])
 load_plugins