diff --git a/Gemfile b/Gemfile index 093d5f7e8..2c408ded5 100644 --- a/Gemfile +++ b/Gemfile @@ -45,7 +45,7 @@ gem 'csv-safe' ##-- for active storage --## gem 'aws-sdk-s3', require: false # original gem isn't maintained actively -# we wanted updated version of farady which is a dependecy for slack-ruby-client +# we wanted updated version of faraday which is a dependency for slack-ruby-client gem 'azure-storage-blob', git: 'https://github.com/chatwoot/azure-storage-ruby', branch: 'chatwoot', require: false gem 'google-cloud-storage', require: false gem 'image_processing' @@ -94,7 +94,7 @@ gem 'slack-ruby-client', '~> 2.0.0' # for dialogflow integrations gem 'google-cloud-dialogflow' # Translate integrations -# 'google-cloud-translate' gem depends on faradau unde 2.0 version +# 'google-cloud-translate' gem depends on faraday 2.0 version # this dependency breaks the slack-ruby-client gem gem 'google-cloud-translate-v3' diff --git a/config/database.yml b/config/database.yml index 2ba77d7bd..5dfaa14b1 100644 --- a/config/database.yml +++ b/config/database.yml @@ -4,7 +4,7 @@ default: &default host: <%= ENV.fetch('POSTGRES_HOST', 'localhost') %> port: <%= ENV.fetch('POSTGRES_PORT', '5432') %> # ref: https://github.com/mperham/sidekiq/issues/2985#issuecomment-531097962 - pool: <%= Sidekiq.server? ? 5 : ENV.fetch('RAILS_MAX_THREADS', 5) %> + pool: <%= Sidekiq.server? ? ENV.fetch('SIDEKIQ_CONCURRENCY', 10) : ENV.fetch('RAILS_MAX_THREADS', 5) %> variables: # we are setting this value to be close to the racktimeout value. we will iterate and reduce this value going forward statement_timeout: <%= ENV["POSTGRES_STATEMENT_TIMEOUT"] || "14s" %> diff --git a/config/sidekiq.yml b/config/sidekiq.yml index c9bf96300..f8c8486d2 100644 --- a/config/sidekiq.yml +++ b/config/sidekiq.yml @@ -4,7 +4,7 @@ # pick it up automatically. --- :verbose: false -:concurrency: <%= ENV.fetch("SIDEKIQ_CONCURRENCY", 5) %> +:concurrency: <%= ENV.fetch("SIDEKIQ_CONCURRENCY", 10) %> :timeout: 25 :max_retries: 3 @@ -33,4 +33,4 @@ production: :concurrency: <%= ENV.fetch("SIDEKIQ_CONCURRENCY", 10) %> staging: - :concurrency: <%= ENV.fetch("SIDEKIQ_CONCURRENCY", 5) %> + :concurrency: <%= ENV.fetch("SIDEKIQ_CONCURRENCY", 10) %>