From: Radek Czajka Date: Wed, 2 Nov 2011 12:11:17 +0000 (+0100) Subject: librarian bump, some deployment fixes X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/fb32a7c7f196afb17f3e90566b9fa4110a152a58?ds=sidebyside;hp=-c librarian bump, some deployment fixes --- fb32a7c7f196afb17f3e90566b9fa4110a152a58 diff --git a/fabfile.py b/fabfile.py index 21719872a..764b9c3b4 100644 --- a/fabfile.py +++ b/fabfile.py @@ -165,4 +165,4 @@ def restart_webserver(): print '>>> restart webserver' run('touch %(path)s/%(project_name)s.wsgi' % env) print '>>> restart Celery' - sudo('supervisord restart %(project_name)s-celery' % env) + sudo('supervisorctl restart celery.%(project_name)s' % env) diff --git a/lib/librarian b/lib/librarian index f8442984a..84ec0eba6 160000 --- a/lib/librarian +++ b/lib/librarian @@ -1 +1 @@ -Subproject commit f8442984a021793164661a54ec84ae9caaf9862b +Subproject commit 84ec0eba63d0933b3f22a7884c46be6b796ee165 diff --git a/wolnelektury-celery.conf.template b/wolnelektury-celery.conf.template index c5d24a4ca..67ac74aa7 100644 --- a/wolnelektury-celery.conf.template +++ b/wolnelektury-celery.conf.template @@ -3,12 +3,12 @@ ; Put this in /etc/supervisor/conf.d ; ========================================= -[program:%(project_name)s-celery] +[program:celery.%(project_name)s] command=%(path)s/bin/python %(path)s/releases/current/%(project_name)s/manage.py celeryd --loglevel=INFO directory=%(path)s/releases/current/%(project_name)s user=%(user)s numprocs=2 -process_name=wolnelektury-celery-%%(process_num) +process_name=wolnelektury-celery-%%(process_num)d stdout_logfile=%(path)s/celeryd.log stderr_logfile=%(path)s/celeryd.log autostart=true