diff --git a/spec/helpers_spec.cr b/spec/helpers_spec.cr index 77bad08..0850b53 100644 --- a/spec/helpers_spec.cr +++ b/spec/helpers_spec.cr @@ -29,7 +29,7 @@ describe "Macros" do end it "sets a custom logger" do config = Kemal::Config::INSTANCE - logger CustomLogHandler.new("production") + logger CustomLogHandler.new config.handlers.last.should be_a(CustomLogHandler) config.logger.should be_a(CustomLogHandler) end diff --git a/spec/logger_spec.cr b/spec/logger_spec.cr index 18e169d..20726f4 100644 --- a/spec/logger_spec.cr +++ b/spec/logger_spec.cr @@ -2,35 +2,13 @@ require "./spec_helper" describe "Kemal::LogHandler" do it "creates a handler" do - logger = Kemal::CommonLogHandler.new "production" + logger = Kemal::CommonLogHandler.new logger.handler.should_not be nil end it "creates a STDOUT handler by default" do config = Kemal.config - logger = Kemal::CommonLogHandler.new "production" + logger = Kemal::CommonLogHandler.new logger.handler.should be_a IO end - - it "creates a file handler in production" do - config = Kemal.config - config.env = "production" - logger = Kemal::CommonLogHandler.new "production" - logger.handler.should be_a File - end - - it "writes to a file in production" do - config = Kemal.config - config.env = "production" - logger = Kemal::CommonLogHandler.new "production" - request = HTTP::Request.new("GET", "/?message=world&time=now") - io = MemoryIO.new - response = HTTP::Server::Response.new(io) - context = HTTP::Server::Context.new(request, response) - logger.call(context) - response.close - str = File.read("kemal.log") - File.delete("kemal.log") - str.includes?("GET /?message=world&time=now").should eq true - end end diff --git a/src/kemal/base_log_handler.cr b/src/kemal/base_log_handler.cr index b2180e3..e5c279a 100644 --- a/src/kemal/base_log_handler.cr +++ b/src/kemal/base_log_handler.cr @@ -2,7 +2,7 @@ require "http" # All loggers must inherit from `Kemal::BaseLogHandler`. class Kemal::BaseLogHandler < HTTP::Handler - def initialize(@env : String) + def initialize end def call(context) diff --git a/src/kemal/common_log_handler.cr b/src/kemal/common_log_handler.cr index 8a6668f..3e79a79 100644 --- a/src/kemal/common_log_handler.cr +++ b/src/kemal/common_log_handler.cr @@ -4,14 +4,8 @@ class Kemal::CommonLogHandler < Kemal::BaseLogHandler @handler : IO::FileDescriptor getter handler - def initialize(@env) - @handler = if @env == "production" - handler = File.new("kemal.log", "a") - handler.flush_on_newline = true - handler - else - STDOUT - end + def initialize + @handler = STDOUT end def call(context) diff --git a/src/kemal/config.cr b/src/kemal/config.cr index 5792256..8c023d5 100644 --- a/src/kemal/config.cr +++ b/src/kemal/config.cr @@ -61,9 +61,9 @@ module Kemal def setup_log_handler @logger ||= if @logging - Kemal::CommonLogHandler.new(@env) + Kemal::CommonLogHandler.new else - Kemal::NullLogHandler.new(@env) + Kemal::NullLogHandler.new end HANDLERS.insert(0, @logger.not_nil!) end