summaryrefslogtreecommitdiff
path: root/lib/nickserver/server.rb
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2016-06-30 11:23:45 +0200
committerAzul <azul@riseup.net>2016-06-30 12:04:07 +0200
commit0491e79c4e5f16d38cf87e53290394e1eccfa2e9 (patch)
tree56d0aff1fc8ca1bbd11b09bc6929f00132467898 /lib/nickserver/server.rb
parent4132d6e6db3755334ace352165991487802c6b82 (diff)
Trying to replace EM base server with reel
some tests are still broken. But at least they are running now.
Diffstat (limited to 'lib/nickserver/server.rb')
-rw-r--r--lib/nickserver/server.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/nickserver/server.rb b/lib/nickserver/server.rb
index 174d6ac..b8f5604 100644
--- a/lib/nickserver/server.rb
+++ b/lib/nickserver/server.rb
@@ -1,9 +1,6 @@
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'
#
@@ -15,7 +12,7 @@ module Nickserver
class Server
#
- # Starts the Nickserver. Must be run inside an EM.run block.
+ # Starts the Nickserver.
#
# Available options:
#
@@ -33,7 +30,7 @@ module Nickserver
puts "Starting nickserver #{options[:host]}:#{options[:port]}"
end
- Nickserver::EmServer.start(options)
+ Nickserver::ReelServer.start(options)
end