mirror of
https://gitea.invidious.io/iv-org/shard-kemal.git
synced 2024-08-15 00:53:36 +00:00
Complete decoupling logger
This commit is contained in:
parent
52538afb10
commit
3c75d727ba
9 changed files with 53 additions and 28 deletions
10
src/kemal.cr
10
src/kemal.cr
|
@ -4,9 +4,8 @@ require "./kemal/middleware/*"
|
|||
at_exit do
|
||||
Kemal::CLI.new
|
||||
config = Kemal.config
|
||||
if config.logging
|
||||
config.logger.write "[#{config.env}] Kemal is ready to lead at #{config.scheme}://#{config.host_binding}:#{config.port}\n"
|
||||
end
|
||||
config.setup_logging
|
||||
config.logger.write "[#{config.env}] Kemal is ready to lead at #{config.scheme}://#{config.host_binding}:#{config.port}\n"
|
||||
config.add_handler Kemal::StaticFileHandler.new(config.public_folder)
|
||||
config.add_handler Kemal::RouteHandler::INSTANCE
|
||||
|
||||
|
@ -14,10 +13,7 @@ at_exit do
|
|||
server.ssl = config.ssl
|
||||
|
||||
Signal::INT.trap {
|
||||
if config.logging
|
||||
config.logger.write "Kemal is going to take a rest!\n"
|
||||
config.logger.handler.close
|
||||
end
|
||||
config.logger.write "Kemal is going to take a rest!\n"
|
||||
server.close
|
||||
exit
|
||||
}
|
||||
|
|
13
src/kemal/base_log_handler.cr
Normal file
13
src/kemal/base_log_handler.cr
Normal file
|
@ -0,0 +1,13 @@
|
|||
require "http"
|
||||
|
||||
class Kemal::BaseLogHandler < HTTP::Handler
|
||||
|
||||
def initialize(@env)
|
||||
end
|
||||
|
||||
def call(context)
|
||||
end
|
||||
|
||||
def write(message)
|
||||
end
|
||||
end
|
|
@ -1,7 +1,7 @@
|
|||
require "colorize"
|
||||
require "http"
|
||||
|
||||
class Kemal::LogHandler < HTTP::Handler
|
||||
class Kemal::CommonLogHandler < Kemal::BaseLogHandler
|
||||
# INSTANCE = new
|
||||
getter handler
|
||||
|
|
@ -2,7 +2,7 @@ module Kemal
|
|||
class Config
|
||||
INSTANCE = Config.new
|
||||
HANDLERS = [] of HTTP::Handler
|
||||
property host_binding, ssl, port, env, public_folder, logging, logger
|
||||
property host_binding, ssl, port, env, public_folder, logging
|
||||
|
||||
def initialize
|
||||
@host_binding = "0.0.0.0" unless @host_binding
|
||||
|
@ -10,7 +10,16 @@ module Kemal
|
|||
@env = "development" unless @env
|
||||
@public_folder = "./public"
|
||||
@logging = true
|
||||
@logger = Kemal::LogHandler.new(@env) if @logging
|
||||
@logger = nil
|
||||
end
|
||||
|
||||
def logger
|
||||
@logger.not_nil!
|
||||
end
|
||||
|
||||
def logger=(logger : Kemal::BaseLogHandler)
|
||||
@logger = logger
|
||||
HANDLERS << @logger.not_nil!
|
||||
end
|
||||
|
||||
def scheme
|
||||
|
@ -21,15 +30,6 @@ module Kemal
|
|||
HANDLERS
|
||||
end
|
||||
|
||||
def logger
|
||||
@logger.not_nil!
|
||||
end
|
||||
|
||||
def logger=(logger)
|
||||
HANDLERS << logger
|
||||
@logger = logger
|
||||
end
|
||||
|
||||
def add_handler(handler : HTTP::Handler)
|
||||
HANDLERS << handler
|
||||
end
|
||||
|
@ -37,6 +37,16 @@ module Kemal
|
|||
def add_ws_handler(handler : HTTP::WebSocketHandler)
|
||||
HANDLERS << handler
|
||||
end
|
||||
|
||||
def setup_logging
|
||||
if @logging
|
||||
@logger = Kemal::CommonLogHandler.new(@env)
|
||||
HANDLERS << @logger.not_nil!
|
||||
elsif @logging == false
|
||||
@logger = Kemal::NullLogHandler.new(@env)
|
||||
HANDLERS << @logger.not_nil!
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def self.config
|
||||
|
|
2
src/kemal/null_log_handler.cr
Normal file
2
src/kemal/null_log_handler.cr
Normal file
|
@ -0,0 +1,2 @@
|
|||
class Kemal::NullLogHandler < Kemal::BaseLogHandler
|
||||
end
|
|
@ -35,7 +35,6 @@ class Kemal::RouteHandler < HTTP::Handler
|
|||
context.response.print body
|
||||
return context
|
||||
rescue ex
|
||||
# Kemal.config.logger.write "Exception: #{ex.to_s}\n"
|
||||
return render_500(context, ex.to_s)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue