From 6a277ba10d94e719fae1ccd07761d6fecbe0222b Mon Sep 17 00:00:00 2001 From: Molly Struve Date: Fri, 14 Feb 2020 15:18:08 -0500 Subject: [PATCH] remove rake jobs:work references from code (#6082) [deploy] --- Procfile | 1 - Procfile.dev | 1 - docker-compose.yml | 10 ---------- docs/backend/notification.md | 2 +- docs/getting-started/start-app.md | 6 ++---- 5 files changed, 3 insertions(+), 17 deletions(-) diff --git a/Procfile b/Procfile index efbe1a4db..f610228f4 100644 --- a/Procfile +++ b/Procfile @@ -1,4 +1,3 @@ release: ./release-tasks.sh web: bin/start-pgbouncer bundle exec puma -C config/puma.rb -worker: bundle exec rails jobs:work sidekiq_worker: bundle exec sidekiq -t 25 diff --git a/Procfile.dev b/Procfile.dev index 3e104f1a1..d9fcd9675 100644 --- a/Procfile.dev +++ b/Procfile.dev @@ -1,4 +1,3 @@ web: bin/rails s -p 3000 webpacker: ./bin/webpack-dev-server -job: bin/rake jobs:work sidekiq: bundle exec sidekiq diff --git a/docker-compose.yml b/docker-compose.yml index 67b7beea9..006fc3c3e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,16 +17,6 @@ services: volumes: - .:/usr/src/app command: bundle exec rails server -b 0.0.0.0 -p 3000 - jobs: - build: . - command: rails jobs:work - depends_on: - - db - - redis - environment: - RAILS_ENV: development - DATABASE_URL: postgres://postgres:mysecretpassword@db:5432/postgres - REDIS_URL: redis://redis:6379 webpacker: build: . command: ./bin/webpack-dev-server diff --git a/docs/backend/notification.md b/docs/backend/notification.md index f7cff4730..21352a8bb 100644 --- a/docs/backend/notification.md +++ b/docs/backend/notification.md @@ -5,7 +5,7 @@ title: Notifications # Notifications Since notifications are run asynchronously, we'll want to make sure jobs are -running: `bin/rails jobs:work`. If that's not running, you won't receive any +running: `bundle exec sidekiq`. If that's not running, you won't receive any notifications. You might need to create another account to pass notifications back and forth if you're doing this all through the UI. diff --git a/docs/getting-started/start-app.md b/docs/getting-started/start-app.md index 88ca63586..ba5622999 100644 --- a/docs/getting-started/start-app.md +++ b/docs/getting-started/start-app.md @@ -32,10 +32,8 @@ If you're using **`pry`** for debugging in Rails, note that using `foreman` and Here are some singleton commands you may need, usually in a separate instance/tab of your shell. -- Running the job server (if using `bin/rails server`) -- this is mostly for - notifications and emails: **`bin/rails jobs:work`** -- Clearing jobs (in case you don't want to wait for the backlog of jobs): - **`bin/rails jobs:clear`** +- Running the job Sidekiq server (if using `bin/rails server`) -- this is mostly + for notifications and emails: **`bundle exec sidekiq`** Current gotchas: potential environment issues with external services need to be worked out.