nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use logging-logger for sidekiq

Browse source 
closes #5975
This commit is contained in:
Benjamin Neff 2015-05-21 01:44:28 +02:00 committed by Dennis Schubert
parent ac96232d85
commit be3b2852be
3 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -12,6 +12,7 @@
* Replace foreman with eye [#5966](https://github.com/diaspora/diaspora/pull/5966) * Replace foreman with eye [#5966](https://github.com/diaspora/diaspora/pull/5966)
* Improved handling of reshares with deleted roots [#5968](https://github.com/diaspora/diaspora/pull/5968) * Improved handling of reshares with deleted roots [#5968](https://github.com/diaspora/diaspora/pull/5968)
* Remove two unused methods [#5970](https://github.com/diaspora/diaspora/pull/5970) * Remove two unused methods [#5970](https://github.com/diaspora/diaspora/pull/5970)
* Refactored the Logger to add basic logrotating and more useful timestamps [#5975](https://github.com/diaspora/diaspora/pull/5975)
## Bug fixes ## Bug fixes
* Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846) * Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846)

4
app/workers/base.rb
View file

@ -8,6 +8,10 @@ module Workers
sidekiq_options backtrace: (bt = AppConfig.environment.sidekiq.backtrace.get) && bt.to_i, sidekiq_options backtrace: (bt = AppConfig.environment.sidekiq.backtrace.get) && bt.to_i,
retry: (rt = AppConfig.environment.sidekiq.retry.get) && rt.to_i retry: (rt = AppConfig.environment.sidekiq.retry.get) && rt.to_i
def logger
@logger ||= ::Logging::Logger[self]
end
# In the long term we need to eliminate the cause of these # In the long term we need to eliminate the cause of these
def suppress_annoying_errors(&block) def suppress_annoying_errors(&block)
yield yield

2
config/initializers/sidekiq.rb
View file

@ -27,6 +27,8 @@ Sidekiq.configure_server do |config|
# Make sure each Sidekiq process has its own sequence of UUIDs # Make sure each Sidekiq process has its own sequence of UUIDs
UUID.generator.next_sequence UUID.generator.next_sequence
Sidekiq.logger = Logging.logger[Sidekiq]
end end
Sidekiq.configure_client do |config| Sidekiq.configure_client do |config|