summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2016-07-02 10:49:48 +0200
committerAzul <azul@riseup.net>2016-07-02 10:49:48 +0200
commit8a664a39bc3dd77a9c53fa5931f81c2b2b8b7295 (patch)
tree3cba8c971a6c7b048b16ae59c364ffc1d60db3f1 /lib
parent39697391452a1306e4aef3a5126bd2b9639b5936 (diff)
minor: silence warnings and cleanup
Diffstat (limited to 'lib')
-rw-r--r--lib/nickserver/adapters/celluloid_http.rb4
-rw-r--r--lib/nickserver/reel_server.rb11
-rw-r--r--lib/nickserver/server.rb1
3 files changed, 12 insertions, 4 deletions
diff --git a/lib/nickserver/adapters/celluloid_http.rb b/lib/nickserver/adapters/celluloid_http.rb
index 9e5fa3b..1adfaca 100644
--- a/lib/nickserver/adapters/celluloid_http.rb
+++ b/lib/nickserver/adapters/celluloid_http.rb
@@ -1,5 +1,7 @@
require 'nickserver/adapters'
-# require 'celluloid/io'
+silence_warnings do
+ require 'celluloid/io'
+end
require 'http'
module Nickserver::Adapters
diff --git a/lib/nickserver/reel_server.rb b/lib/nickserver/reel_server.rb
index abda57f..8e17bc6 100644
--- a/lib/nickserver/reel_server.rb
+++ b/lib/nickserver/reel_server.rb
@@ -1,5 +1,6 @@
-require 'celluloid/autostart'
-require 'reel'
+silence_warnings do
+ require 'reel'
+end
require 'nickserver/adapters/celluloid_http'
require 'nickserver/request_handler'
@@ -14,6 +15,12 @@ module Nickserver
super(host, port, &method(:on_connection))
end
+ def handle_connection(*args)
+ silence_warnings do
+ super
+ end
+ end
+
def on_connection(connection)
connection.each_request do |request|
handler = handler_for(request)
diff --git a/lib/nickserver/server.rb b/lib/nickserver/server.rb
index b8f5604..8f4a49f 100644
--- a/lib/nickserver/server.rb
+++ b/lib/nickserver/server.rb
@@ -6,7 +6,6 @@ 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