diff options
author | mguetlein <martin.guetlein@gmail.com> | 2011-01-21 11:52:53 +0100 |
---|---|---|
committer | mguetlein <martin.guetlein@gmail.com> | 2011-01-21 11:52:53 +0100 |
commit | 0e759bee80e2668e1fec7b741a4ea18015f98b84 (patch) | |
tree | fa4d00fcbcaee092d5f16eb7ec785b0ed8f11f91 /lib/overwrite.rb | |
parent | 9d06bd3024139f2bfee4722c7536ee4ffa99fe32 (diff) |
simplify error handling once again, and adding http code
Diffstat (limited to 'lib/overwrite.rb')
-rw-r--r-- | lib/overwrite.rb | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/lib/overwrite.rb b/lib/overwrite.rb index 2f9fabd..83d8099 100644 --- a/lib/overwrite.rb +++ b/lib/overwrite.rb @@ -18,22 +18,9 @@ error Exception do error = request.env['sinatra.error'] # log error to logfile LOGGER.error error.class.to_s+": "+error.message - case error.class - when OpenTox::BadRequestError - code = 400 - when OpenTox::NotAuthorizedError - code = 401 - when OpenTox::NotFoundError - code = 404 - when OpenTox::RestCallError - code = 502 - else - # (unwanted RuntimeExceptions as well as sth. like 'raise "invalid state"' is handled here) - code = 500 - # log backtrace for debugging - LOGGER.error error.backtrace.join("\n") - end - halt code,OpenTox::ErrorReport.format(error,request,response) + # log backtrace only if code is 500 -> unwanted (Runtime)Exceptions and internal errors (see error.rb) + LOGGER.error error.backtrace.join("\n") if error.http_code==500 + halt error.http_code,OpenTox::ErrorReport.format(error,request,response) end class String |