diff options
author | Azul <azul@riseup.net> | 2016-06-09 12:11:03 +0200 |
---|---|---|
committer | Azul <azul@riseup.net> | 2016-06-09 12:11:03 +0200 |
commit | 56263b6512f60cf055a925f5446f1f504bb65a4d (patch) | |
tree | 2e59de9101c5976bd002f5ffc816f9fd22d0c386 /lib/nickserver/server.rb | |
parent | 80d85a0396fb0dbb27ac1b0885d5461ccc0cfbf2 (diff) |
add Hkp::Source with same interface as CouchDB::Source
Diffstat (limited to 'lib/nickserver/server.rb')
-rw-r--r-- | lib/nickserver/server.rb | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/lib/nickserver/server.rb b/lib/nickserver/server.rb index c6615d2..2453f94 100644 --- a/lib/nickserver/server.rb +++ b/lib/nickserver/server.rb @@ -5,7 +5,7 @@ silence_warnings do end require 'json' require 'nickserver/couch_db/source' -require 'nickserver/hkp/response' +require 'nickserver/hkp/source' require 'nickserver/adapters/em_http' @@ -91,22 +91,12 @@ module Nickserver def send_key(uid) if local_address?(uid) - @source = Nickserver::CouchDB::Source.new(adapter) - @source.query(uid) do |response| - send_response(status: response.status, content: response.content) - end + source = Nickserver::CouchDB::Source.new(adapter) else - @fetcher = Nickserver::Hkp::FetchKey.new - @fetcher.get(uid).callback {|key| - response = Nickserver::Hkp::Response.new(uid, key) - send_response(status: response.status, content: response.content) - }.errback {|status, msg| - if status == 404 - send_not_found - else - send_response(status: status, content: msg) - end - } + source = Nickserver::Hkp::Source.new(adapter) + end + source.query(uid) do |response| + send_response(status: response.status, content: response.content) end end |