diff --git a/servers/puppet/modules/humbug/files/nagios3/commands.cfg b/servers/puppet/modules/humbug/files/nagios3/commands.cfg index 8196a6954b..a617a5588c 100644 --- a/servers/puppet/modules/humbug/files/nagios3/commands.cfg +++ b/servers/puppet/modules/humbug/files/nagios3/commands.cfg @@ -103,7 +103,7 @@ define command{ define command{ command_name check_process_mailchimp_signups - command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l nagios -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_procs -u humbug -c 1:1 -a "manage.py subscribe_new_users"' + command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l nagios -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_procs -u humbug -c 1:1 -a "manage.py process_signups"' } define command{ diff --git a/servers/puppet/modules/humbug/files/supervisord/conf.d/humbug.conf b/servers/puppet/modules/humbug/files/supervisord/conf.d/humbug.conf index 240b79f858..8f4cff7b82 100644 --- a/servers/puppet/modules/humbug/files/supervisord/conf.d/humbug.conf +++ b/servers/puppet/modules/humbug/files/supervisord/conf.d/humbug.conf @@ -66,8 +66,8 @@ redirect_stderr=true ; redirect proc stderr to stdout (default false) stdout_logfile=/var/log/humbug/events-user-activity.log ; stdout log path, NONE for none; default AUTO directory=/home/humbug/humbug-deployments/current/ -[program:humbug-events-subscribe-new-users] -command=python /home/humbug/humbug-deployments/current/manage.py subscribe_new_users +[program:humbug-events-signups] +command=python /home/humbug/humbug-deployments/current/manage.py process_signups priority=400 ; the relative start priority (default 999) autostart=true ; start at supervisord start (default: true) autorestart=true ; whether/when to restart (default: unexpected) @@ -75,7 +75,7 @@ stopsignal=TERM ; signal used to kill process (default TERM) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) user=humbug ; setuid to this UNIX account to run the program redirect_stderr=true ; redirect proc stderr to stdout (default false) -stdout_logfile=/var/log/humbug/events-subscribe-new-users.log ; stdout log path, NONE for none; default AUTO +stdout_logfile=/var/log/humbug/events-signups.log ; stdout log path, NONE for none; default AUTO directory=/home/humbug/humbug-deployments/current/ [program:humbug-events-confirmation-emails] @@ -107,7 +107,7 @@ directory=/home/humbug/humbug-deployments/current/ ; process groups. [group:humbug-workers] -programs=humbug-events-user-activity,humbug-events-subscribe-new-users,humbug-events-confirmation-emails,humbug-events-missedmessage_reminders ; each refers to 'x' in [program:x] definitions +programs=humbug-events-user-activity,humbug-events-signups,humbug-events-confirmation-emails,humbug-events-missedmessage_reminders ; each refers to 'x' in [program:x] definitions ; The [include] section can just contain the "files" setting. This ; setting can list multiple files (separated by whitespace or diff --git a/zephyr/management/commands/subscribe_new_users.py b/zephyr/management/commands/process_signups.py similarity index 100% rename from zephyr/management/commands/subscribe_new_users.py rename to zephyr/management/commands/process_signups.py