diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-17 18:01:20 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-17 18:01:20 +0300 |
| commit | 546fa165ff728bc2d25ed9b55b95dd1d48139d4a (patch) | |
| tree | 612a9800dba636c8053706363675bbac2c91c626 /config | |
| parent | e47989a58b8a9f83855ea9210ba5786fc14fb841 (diff) | |
| parent | 170efaaba273792ddffc2806ef1501f33d87a5a2 (diff) | |
Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into 'master'
Enable Style/MultilineOperationIndentation in Rubocop
Fixes #25741
See merge request !8125
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/sidekiq.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 1d7a3f03ace..5a7365bb0f6 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -34,7 +34,7 @@ Sidekiq.configure_server do |config| # Database pool should be at least `sidekiq_concurrency` + 2 # For more info, see: https://github.com/mperham/sidekiq/blob/master/4.0-Upgrade.md config = ActiveRecord::Base.configurations[Rails.env] || - Rails.application.config.database_configuration[Rails.env] + Rails.application.config.database_configuration[Rails.env] config['pool'] = Sidekiq.options[:concurrency] + 2 ActiveRecord::Base.establish_connection(config) Rails.logger.debug("Connection Pool size for Sidekiq Server is now: #{ActiveRecord::Base.connection.pool.instance_variable_get('@size')}") |