From 8052ecdbc151488ca6b28c83eb14556a6a4216a3 Mon Sep 17 00:00:00 2001 From: wimo7083 Date: Tue, 4 Sep 2018 11:35:32 -0600 Subject: [PATCH 1/8] add target to remove images --- Makefile | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b9f79c8c..6daeeb03 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,25 @@ RAILS_CONTAINER := web +DOCKER := docker .PHONY: all -all: run +all: run + + +.PHONY: nuke +nuke: + ${DOCKER} system prune -a --volumes + +.PHONY: rmi +rmi: + ${DOCKER} images -q | xargs docker rmi -f + +.PHONY: rmdi +rmdi: + ${DOCKER} images -a --filter=dangling=true -q | xargs ${DOCKER} rmi + +.PHONY: rm-exited-containers +rm-exited-containers: + ${DOCKER} ps -a -q -f status=exited | xargs ${DOCKER} rm -v .PHONY: console-sandbox console-sandbox: From 9e07994f94e765c65cac2bd81fac5eb8ce031950 Mon Sep 17 00:00:00 2001 From: wimo7083 Date: Tue, 4 Sep 2018 11:35:45 -0600 Subject: [PATCH 2/8] attempt to try without death_handler --- config/initializers/sidekiq.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 6b952b8a..bc95bc50 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -9,11 +9,11 @@ ENV['DATABASE_URL'] = ENV['POSTGRES_HOST'].present? ? ENV['POSTGRES_HOST'] : 'operationcode-psql' # https://stackoverflow.com/questions/28412913/disable-automatic-retry-with-activejob-used-with-sidekiq # prevent excessive retries from some default status. - config.death_handlers << lambda { |job, e| - # thanks rob for the nice message - evt = Raven::Event.new(message: "#{job['class']} #{job['jid']} done run outta tries.") - Raven.send_event(evt) - } + #config.death_handlers << lambda { |job, e| + # # thanks rob for the nice message + # evt = Raven::Event.new(message: "#{job['class']} #{job['jid']} done run outta tries.") + # Raven.send_event(evt) + #} config.server_middleware do |chain| chain.add Sidekiq::Middleware::Server::RetryJobs, maxretries: 5 From 95462a91dd18eb60a93dfd11e932ea73a4c05a7a Mon Sep 17 00:00:00 2001 From: wimo7083 Date: Tue, 4 Sep 2018 13:50:29 -0600 Subject: [PATCH 3/8] remove comments for death_handler --- config/initializers/sidekiq.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index bc95bc50..5d38f17b 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -7,13 +7,6 @@ # Sidekiq.configure_server do |config| ENV['DATABASE_URL'] = ENV['POSTGRES_HOST'].present? ? ENV['POSTGRES_HOST'] : 'operationcode-psql' - # https://stackoverflow.com/questions/28412913/disable-automatic-retry-with-activejob-used-with-sidekiq - # prevent excessive retries from some default status. - #config.death_handlers << lambda { |job, e| - # # thanks rob for the nice message - # evt = Raven::Event.new(message: "#{job['class']} #{job['jid']} done run outta tries.") - # Raven.send_event(evt) - #} config.server_middleware do |chain| chain.add Sidekiq::Middleware::Server::RetryJobs, maxretries: 5 From 1b1256bea50eee7f2b3b7459d4517316b8938f30 Mon Sep 17 00:00:00 2001 From: wimo7083 Date: Tue, 4 Sep 2018 16:02:14 -0600 Subject: [PATCH 4/8] linting fixes --- app/jobs/send_email_to_leaders_job.rb | 1 - app/jobs/slack_jobs/inviter_job.rb | 1 - 2 files changed, 2 deletions(-) diff --git a/app/jobs/send_email_to_leaders_job.rb b/app/jobs/send_email_to_leaders_job.rb index c43da824..84f780d6 100644 --- a/app/jobs/send_email_to_leaders_job.rb +++ b/app/jobs/send_email_to_leaders_job.rb @@ -3,6 +3,5 @@ class SendEmailToLeadersJob < ActiveJob::Base def perform(_user_id) logger.debug 'Deprecated pathway, trying to determine what is placing this on queue.' - end end end diff --git a/app/jobs/slack_jobs/inviter_job.rb b/app/jobs/slack_jobs/inviter_job.rb index 7637fd37..92d07990 100644 --- a/app/jobs/slack_jobs/inviter_job.rb +++ b/app/jobs/slack_jobs/inviter_job.rb @@ -2,7 +2,6 @@ class SlackJobs class InviterJob < SlackJobs def perform(_email) logger.debug 'Deprecated pathway, trying to determine what is placing this on queue.' - end end end From 7c04c68503e88728671f3fc15bd50fe170e14765 Mon Sep 17 00:00:00 2001 From: wimo7083 Date: Tue, 4 Sep 2018 16:38:56 -0600 Subject: [PATCH 5/8] reduce indentation --- app/jobs/send_email_to_leaders_job.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/send_email_to_leaders_job.rb b/app/jobs/send_email_to_leaders_job.rb index 84f780d6..b7c352e2 100644 --- a/app/jobs/send_email_to_leaders_job.rb +++ b/app/jobs/send_email_to_leaders_job.rb @@ -2,6 +2,6 @@ class SendEmailToLeadersJob < ActiveJob::Base queue_as :default def perform(_user_id) - logger.debug 'Deprecated pathway, trying to determine what is placing this on queue.' + logger.debug 'Deprecated pathway, trying to determine what is placing this on queue.' end end From 715d833b6cc186e177ae68c713012cb518fb5391 Mon Sep 17 00:00:00 2001 From: wimo7083 Date: Tue, 4 Sep 2018 19:34:29 -0600 Subject: [PATCH 6/8] update sidekiq to allow death_handlers --- Gemfile.lock | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2d6cbfa2..ec422f04 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,7 +79,7 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.0.5) - connection_pool (2.2.1) + connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) @@ -186,9 +186,9 @@ GEM pry (>= 0.10.4) public_suffix (3.0.0) puma (3.8.2) - rack (2.0.1) + rack (2.0.5) rack-cors (0.4.1) - rack-protection (2.0.0) + rack-protection (2.0.3) rack rack-test (0.6.3) rack (>= 1.0) @@ -226,7 +226,7 @@ GEM rb-fsevent (0.9.8) rb-inotify (0.9.8) ffi (>= 0.5.0) - redis (3.3.3) + redis (3.3.5) responders (2.3.0) railties (>= 4.2.0, < 5.1) rubocop (0.55.0) @@ -248,11 +248,10 @@ GEM ruby_http_client (~> 3.0.1) sentry-raven (2.5.3) faraday (>= 0.7.6, < 1.0) - sidekiq (4.2.10) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) + sidekiq (5.2.1) + connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) - redis (~> 3.2, >= 3.2.1) + redis (>= 3.3.5, < 5) skylight (1.5.0) activesupport (>= 3.0.0) spring (2.0.1) From e17816131cadae76dc2e2ecde5b7fbf6ce304f6f Mon Sep 17 00:00:00 2001 From: wimo7083 Date: Tue, 4 Sep 2018 19:34:42 -0600 Subject: [PATCH 7/8] readd death handler --- config/initializers/sidekiq.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 443b0f99..732195bc 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -7,7 +7,13 @@ # Sidekiq.configure_server do |config| ENV['DATABASE_URL'] = ENV['POSTGRES_HOST'].present? ? ENV['POSTGRES_HOST'] : 'operationcode-psql' - + # https://stackoverflow.com/questions/28412913/disable-automatic-retry-with-activejob-used-with-sidekiq + # prevent excessive retries from some default status. + config.death_handlers << lambda { |job, e| + # thanks rob for the nice message + evt = Raven::Event.new(message: "#{job['class']} #{job['jid']} done run outta tries.") + Raven.send_event(evt) + } Rails.logger = Sidekiq::Logging.logger ActiveRecord::Base.logger = Sidekiq::Logging.logger end From e4dd4363f13ac2dfa597df26362fd8286490de48 Mon Sep 17 00:00:00 2001 From: wimo7083 Date: Tue, 4 Sep 2018 20:25:57 -0600 Subject: [PATCH 8/8] remove DATABASE_URL override, setting to wrong format --- config/initializers/sidekiq.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 732195bc..937538b0 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -1,12 +1,6 @@ require 'sidekiq' -# Setting the ENV['DATABASE_URL'] explicitly to allow for use of a -# dynamic database host variable ENV['POSTGRES_HOST'] -# -# @see https://github.com/mperham/sidekiq/wiki/Advanced-Options#rails-32-and-newer -# Sidekiq.configure_server do |config| - ENV['DATABASE_URL'] = ENV['POSTGRES_HOST'].present? ? ENV['POSTGRES_HOST'] : 'operationcode-psql' # https://stackoverflow.com/questions/28412913/disable-automatic-retry-with-activejob-used-with-sidekiq # prevent excessive retries from some default status. config.death_handlers << lambda { |job, e|