diff --git a/lib/sneakers.rb b/lib/sneakers.rb index 8f2cd371..aa272aed 100644 --- a/lib/sneakers.rb +++ b/lib/sneakers.rb @@ -46,11 +46,11 @@ def clear! @configured = false end - def daemonize!(loglevel=Logger::INFO) + def daemonize!(loglevel=nil) CONFIG[:log] = 'sneakers.log' + CONFIG[:log_level] = loglevel || Logger::INFO CONFIG[:daemonize] = true setup_general_logger! - logger.level = loglevel end def rake_worker_classes=(worker_classes) @@ -109,7 +109,7 @@ def setup_general_logger! if [:info, :debug, :error, :warn].all?{ |meth| CONFIG[:log].respond_to?(meth) } @logger = CONFIG[:log] else - @logger = ServerEngine::DaemonLogger.new(CONFIG[:log]) + @logger = ServerEngine::DaemonLogger.new(CONFIG[:log], CONFIG.slice(:log_level, :log_rotate_age, :log_rotate_size)) @logger.formatter = Sneakers::Support::ProductionFormatter end end @@ -124,4 +124,3 @@ def setup_general_publisher! @publisher = Sneakers::Publisher.new end end - diff --git a/lib/sneakers/configuration.rb b/lib/sneakers/configuration.rb index 865463d7..b33311d8 100644 --- a/lib/sneakers/configuration.rb +++ b/lib/sneakers/configuration.rb @@ -5,7 +5,7 @@ module Sneakers class Configuration extend Forwardable - def_delegators :@hash, :to_hash, :[], :[]=, :==, :fetch, :delete, :has_key?, :dig + def_delegators :@hash, :to_hash, :[], :[]=, :==, :fetch, :delete, :has_key?, :dig, :slice EXCHANGE_OPTION_DEFAULTS = { :type => :direct, @@ -35,6 +35,11 @@ class Configuration :log => STDOUT, :pid_path => 'sneakers.pid', :amqp_heartbeat => 30, + + # Default values from serverengine + :log_rotate_age => 5, + :log_rotate_size => 1048576, + :log_level => 'debug', # workers :prefetch => 10, diff --git a/spec/sneakers/worker_spec.rb b/spec/sneakers/worker_spec.rb index ec02ff13..ea19fc53 100644 --- a/spec/sneakers/worker_spec.rb +++ b/spec/sneakers/worker_spec.rb @@ -218,7 +218,10 @@ def work(msg) :hooks => {}, :handler => Sneakers::Handlers::Oneshot, :heartbeat => 30, - :amqp_heartbeat => 30 + :amqp_heartbeat => 30, + :log_rotate_age => 5, + :log_rotate_size => 1048576, + :log_level => "debug" ) end @@ -256,7 +259,10 @@ def work(msg) :hooks => {}, :handler => Sneakers::Handlers::Oneshot, :heartbeat => 5, - :amqp_heartbeat => 30 + :amqp_heartbeat => 30, + :log_rotate_age => 5, + :log_rotate_size => 1048576, + :log_level => "debug" ) end @@ -294,7 +300,10 @@ def work(msg) :hooks => {}, :handler => Sneakers::Handlers::Oneshot, :heartbeat => 30, - :amqp_heartbeat => 30 + :amqp_heartbeat => 30, + :log_rotate_age => 5, + :log_rotate_size => 1048576, + :log_level => "debug" ) end end