From 161dfb70f38378a132ee76b5aaac3664040c7d2d Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Wed, 19 Jul 2023 16:47:08 -0500 Subject: [PATCH] fixes for changes to sidekiq --- Gemfile | 2 +- environment.rb | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 99544a19..0d6b6ede 100644 --- a/Gemfile +++ b/Gemfile @@ -2,8 +2,8 @@ source 'https://rubygems.org' gem 'sinatra' gem 'redis' -gem 'redis-namespace' gem 'sequel' +gem 'redis-namespace' gem 'bcrypt' gem 'sinatra-flash', require: 'sinatra/flash' gem 'sinatra-xsendfile', require: 'sinatra/xsendfile' diff --git a/environment.rb b/environment.rb index 7b1d9fb8..de6d5231 100644 --- a/environment.rb +++ b/environment.rb @@ -40,6 +40,7 @@ DB = Sequel.connect $config['database'], sslmode: 'disable', max_connections: $c DB.extension :pagination DB.extension :auto_literal_strings Sequel.split_symbols = true +Sidekiq.strict_args!(false) require 'will_paginate/sequel' @@ -54,9 +55,13 @@ end =end # :nocov: -Sidekiq::Logging.logger = nil unless ENV['RACK_ENV'] == 'production' +unless ENV['RACK_ENV'] == 'production' + Sidekiq.configure_server do |config| + config.logger = nil + end +end -sidekiq_redis_config = {namespace: 'neocitiesworker'} +sidekiq_redis_config = {} sidekiq_redis_config[:url] = $config['sidekiq_url'] if $config['sidekiq_url'] # :nocov: