Skip to content

Pass logger configuration values through to logger initialization #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelklishin merged 4 commits into from
May 7, 2025
Merged

Pass logger configuration values through to logger initialization #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5855edf
Update configuration.rb to allow logger configuration values
cdhagmann May 7, 2025
a5a5e6d
Update sneakers.rb to pass in config values
cdhagmann May 7, 2025
a6a6bee
Update configuration.rb to accept slice method
cdhagmann May 7, 2025
2232ebb
Update test and minor cleanup
May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions lib/sneakers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -124,4 +124,3 @@ def setup_general_publisher!
@publisher = Sneakers::Publisher.new
end
end

7 changes: 6 additions & 1 deletion lib/sneakers/configuration.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -35,6 +35,11 @@ class Configuration
:log => STDOUT,
:pid_path => 'sneakers.pid',
:amqp_heartbeat => 30,

# Default values from serverengine
Copy link
Copy Markdown
Member

@michaelklishin michaelklishin May 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a good idea!

:log_rotate_age => 5,
:log_rotate_size => 1048576,
:log_level => 'debug',

# workers
:prefetch => 10,
Expand Down
15 changes: 12 additions & 3 deletions spec/sneakers/worker_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
Loading