Skip to content

Remove job_runs.sh (LG-5031) #5506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zachmargolis merged 8 commits into from
Oct 28, 2021
Merged

Remove job_runs.sh (LG-5031) #5506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1ee6a1b
Remove job_runs.sh and associated models
zachmargolis Oct 14, 2021
861a516
remove ruby_workers_cron_enabled config, its now always on
zachmargolis Oct 14, 2021
b135320
add removal note
zachmargolis Oct 14, 2021
38c7dcb
remove health job controller
zachmargolis Oct 15, 2021
72e2260
lints
zachmargolis Oct 15, 2021
672b310
clean up tests
zachmargolis Oct 15, 2021
e0c0007
Merge branch 'main' into margolis-remove-job-runs
zachmargolis Oct 19, 2021
2fe7937
Merge remote-tracking branch 'origin/main' into margolis-remove-job-runs
zachmargolis Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Procfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
web: bundle exec rackup config.ru --port ${PORT:-3000} --host ${HOST:-localhost}
worker: bundle exec good_job start
job_runs: bundle exec rake job_runs:run
mailcatcher: mailcatcher -f
webpacker: ./bin/webpack-dev-server
9 changes: 0 additions & 9 deletions app/controllers/health/health_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'job_runner/runner'

module Health
class HealthController < AbstractHealthController
private
Expand All @@ -9,14 +7,7 @@ def health_checker
database: DatabaseHealthChecker,
account_reset: AccountResetHealthChecker,
}
if job_run_healthchecks_enabled?
checkers[:job_runner_critical] = JobRunner::HealthCheckerCritical
end
MultiHealthChecker.new(**checkers)
end

def job_run_healthchecks_enabled?
IdentityConfig.store.job_run_healthchecks_enabled
end
end
end
9 changes: 0 additions & 9 deletions app/controllers/health/jobs_controller.rb
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions app/models/job_run.rb
View file
Open in desktop

This file was deleted.

50 changes: 2 additions & 48 deletions bin/job_runs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,5 @@
#!/bin/bash
set -euo pipefail

usage() {
cat >&2 <<EOM
usage: $(basename "$0") {start|stop|status} [PIDFILE]

Init script for IdP background job runner.

PIDFILE: if provided, fork to run in background (allowing stop/status as well)
EOM
}

run() {
echo >&2 "+ $*"
"$@"
}

if [ $# -lt 1 ] || [ $# -gt 2 ]; then
usage
exit 1
fi

PIDFILE=
if [ $# -ge 2 ]; then
PIDFILE="$2"
fi

case $1 in
start)
# If PIDFILE is given, fork into background
if [ -n "$PIDFILE" ]; then
run rbenv exec bundle exec rake "job_runs:run[$PIDFILE]" &
# save last process pid to the pidfile
echo "$!" > "$PIDFILE"
else
run rbenv exec bundle exec rake job_runs:run
fi
;;
stop)
pid="$(run cat "$PIDFILE")"
run kill -2 "$pid"
;;
status)
pid="$(run cat "$PIDFILE")"
run ps -fp "$pid"
;;
*)
usage
;;
esac
# This file can be removed when we remove the service that calls from devops
sleep 100
2 changes: 0 additions & 2 deletions config/application.yml.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ idv_max_attempts: '5'
idv_min_age_years: '13'
idv_send_link_attempt_window_in_minutes: '10'
idv_send_link_max_attempts: '5'
job_run_healthchecks_enabled: 'true'
liveness_checking_enabled: 'false'
logins_per_ip_track_only_mode: 'false'
# LexisNexis #####################################################
Expand Down Expand Up @@ -190,7 +189,6 @@ risc_notifications_rate_limit_interval: '60'
risc_notifications_rate_limit_max_requests: '1000'
risc_notifications_rate_limit_overrides: '{"https://example.com/push":{"interval":120,"max_requests":10000}}'
risc_notifications_request_timeout: '3'
ruby_workers_cron_enabled: 'true'
ruby_workers_idv_enabled: 'true'
rules_of_use_horizon_years: '6'
rules_of_use_updated_at: '2021-05-21T00:00:00Z'
Expand Down
Loading