Merge pull request #5 from azul/celluloid

Use Celluloid, Reel and Celluloid I/O based http requests

1 files changed, 3 insertions, 7 deletions

diff --git a/lib/nickserver/server.rb b/lib/nickserver/server.rb
index 174d6ac..8f4a49f 100644
--- a/lib/nickserver/server.rb
+++ b/lib/nickserver/server.rb
@@ -1,21 +1,17 @@
 require 'kernel_ext'
 require 'json'
-require 'nickserver/em_server'
-require 'nickserver/couch_db/source'
-require 'nickserver/hkp/source'
-require 'nickserver/adapters/em_http'
+require 'nickserver/reel_server'
 
 
 #
 # This is the main HTTP server that clients connect to in order to fetch keys
 #
-# For info on EM::HttpServer, see https://github.com/eventmachine/evma_httpserver
 #
 module Nickserver
   class Server
 
     #
-    # Starts the Nickserver. Must be run inside an EM.run block.
+    # Starts the Nickserver.
     #
     # Available options:
     #
@@ -33,7 +29,7 @@ module Nickserver
         puts "Starting nickserver #{options[:host]}:#{options[:port]}"
       end
 
-      Nickserver::EmServer.start(options)
+      Nickserver::ReelServer.start(options)
     end