mirror of
https://gitea.invidious.io/iv-org/shard-kemal.git
synced 2024-08-15 00:53:36 +00:00
Code fixes reported by static code analysis (#450)
This commit is contained in:
parent
f3f7e319ae
commit
c2236acf3a
14 changed files with 60 additions and 65 deletions
|
@ -34,7 +34,7 @@ module Kemal
|
|||
config.port = port if port
|
||||
|
||||
unless Kemal.config.error_handlers.has_key?(404)
|
||||
error 404 do |env|
|
||||
error 404 do
|
||||
render_404
|
||||
end
|
||||
end
|
||||
|
@ -50,7 +50,7 @@ module Kemal
|
|||
# This route serves the built-in images for not_found and exceptions.
|
||||
get "/__kemal__/404.png" do |env|
|
||||
file_path = File.expand_path("lib/kemal/images/404.png", Dir.current)
|
||||
|
||||
|
||||
if File.exists? file_path
|
||||
send_file env, file_path
|
||||
else
|
||||
|
|
|
@ -5,18 +5,16 @@ module Kemal
|
|||
INSTANCE = new
|
||||
|
||||
def call(context : HTTP::Server::Context)
|
||||
begin
|
||||
call_next(context)
|
||||
rescue ex : Kemal::Exceptions::RouteNotFound
|
||||
call_exception_with_status_code(context, ex, 404)
|
||||
rescue ex : Kemal::Exceptions::CustomException
|
||||
call_exception_with_status_code(context, ex, context.response.status_code)
|
||||
rescue ex : Exception
|
||||
log("Exception: #{ex.inspect_with_backtrace}")
|
||||
return call_exception_with_status_code(context, ex, 500) if Kemal.config.error_handlers.has_key?(500)
|
||||
verbosity = Kemal.config.env == "production" ? false : true
|
||||
return render_500(context, ex.inspect_with_backtrace, verbosity)
|
||||
end
|
||||
call_next(context)
|
||||
rescue ex : Kemal::Exceptions::RouteNotFound
|
||||
call_exception_with_status_code(context, ex, 404)
|
||||
rescue ex : Kemal::Exceptions::CustomException
|
||||
call_exception_with_status_code(context, ex, context.response.status_code)
|
||||
rescue ex : Exception
|
||||
log("Exception: #{ex.inspect_with_backtrace}")
|
||||
return call_exception_with_status_code(context, ex, 500) if Kemal.config.error_handlers.has_key?(500)
|
||||
verbosity = Kemal.config.env == "production" ? false : true
|
||||
return render_500(context, ex.inspect_with_backtrace, verbosity)
|
||||
end
|
||||
|
||||
private def call_exception_with_status_code(context : HTTP::Server::Context, exception : Exception, status_code : Int32)
|
||||
|
|
|
@ -2,22 +2,22 @@
|
|||
# Currently it contains templates for 404 and 500 error codes.
|
||||
|
||||
def render_404
|
||||
template = <<-HTML
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<style type="text/css">
|
||||
body { text-align:center;font-family:helvetica,arial;font-size:22px;
|
||||
color:#888;margin:20px}
|
||||
img { max-width: 579px; width: 100%; }
|
||||
#c {margin:0 auto;width:500px;text-align:left}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h2>Kemal doesn't know this way.</h2>
|
||||
<img src="/__kemal__/404.png">
|
||||
</body>
|
||||
</html>
|
||||
<<-HTML
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<style type="text/css">
|
||||
body { text-align:center;font-family:helvetica,arial;font-size:22px;
|
||||
color:#888;margin:20px}
|
||||
img { max-width: 579px; width: 100%; }
|
||||
#c {margin:0 auto;width:500px;text-align:left}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h2>Kemal doesn't know this way.</h2>
|
||||
<img src="/__kemal__/404.png">
|
||||
</body>
|
||||
</html>
|
||||
HTML
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue