summaryrefslogtreecommitdiff
path: root/lib/nickserver/dispatcher.rb
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2016-10-17 08:58:08 +0000
committerazul <azul@riseup.net>2016-10-17 08:58:08 +0000
commit5dae257996c480c3f7b5a220fcaf97812a560466 (patch)
tree2edc9f7b40d7b04e4cf739e6e92b200f93cd57e7 /lib/nickserver/dispatcher.rb
parent6721f0732facd87404eecc288357fd1bd0de48cf (diff)
parent5967c4a568aff2c5e73e3ab933aa68d25387aeb1 (diff)
Merge branch 'feature/log-requests-and-errors' into 'master'
Log requests and errors proper logging See merge request !6
Diffstat (limited to 'lib/nickserver/dispatcher.rb')
-rw-r--r--lib/nickserver/dispatcher.rb11
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/nickserver/dispatcher.rb b/lib/nickserver/dispatcher.rb
index 869f721..71e71cf 100644
--- a/lib/nickserver/dispatcher.rb
+++ b/lib/nickserver/dispatcher.rb
@@ -39,10 +39,6 @@ module Nickserver
def handle(request)
handler_chain.handle request
- rescue RuntimeError => exc
- puts "Error: #{exc}"
- puts exc.backtrace
- ErrorResponse.new(exc.to_s)
end
def handler_chain
@@ -62,9 +58,10 @@ module Nickserver
end
def proxy_error_response
- exception = handler_chain.rescued_exceptions.first
- if exception
- Nickserver::Response.new(502, exception.to_s)
+ exc = handler_chain.rescued_exceptions.first
+ if exc
+ Nickserver::Response.new 502,
+ JSON.dump(error: exc.to_s)
end
end