Mercurial > kallithea
annotate init.d/celeryd-upstart.conf @ 6949:5395bb85a991
diff: fix crash when displaying diff on a single file
File diff on an image file would fail on
%if op in 'DM':
because op was None:
TypeError: 'in <string>' requires string as left operand, not NoneType
But really, if op is None, we also don't want to show invalid "Show images"
links. Thus, guard the whole image display section with having an actual op.
_parse_gitdiff will never return op None, but wrapped_diff is more lazy and
might do that. It could be considered a bug in wrapped_diff, and this change is
just a bad workaround.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Mon, 23 Oct 2017 01:15:06 +0200 |
parents | 2c3d30095d5e |
children | 1d539bb18165 |
rev | line source |
---|---|
4190
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1811
diff
changeset
|
1 # celeryd - run the celeryd daemon as an upstart job for kallithea |
1811
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
2 # Change variables/paths as necessary and place file /etc/init/celeryd.conf |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
3 # start/stop/restart as normal upstart job (ie: $ start celeryd) |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
4 |
6370
e285bb7abb28
scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents:
4212
diff
changeset
|
5 description "Celery for Kallithea Mercurial Server" |
e285bb7abb28
scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents:
4212
diff
changeset
|
6 author "Matt Zuba <matt.zuba@goodwillaz.org" |
1811
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
7 |
4190
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1811
diff
changeset
|
8 start on starting kallithea |
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1811
diff
changeset
|
9 stop on stopped kallithea |
1811
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
10 |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
11 respawn |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
12 |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
13 umask 0022 |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
14 |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
15 env PIDFILE=/tmp/celeryd.pid |
4190
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1811
diff
changeset
|
16 env APPINI=/var/hg/kallithea/production.ini |
1811
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
17 env HOME=/var/hg |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
18 env USER=hg |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
19 # To use group (if different from user), you must edit sudoers file and change |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
20 # root's entry from (ALL) to (ALL:ALL) |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
21 # env GROUP=hg |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
22 |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
23 script |
6554
2c3d30095d5e
gearbox: replace paster with something TurboGears2-ish that still works with the Pylons stack
Mads Kiilerich <madski@unity3d.com>
parents:
6370
diff
changeset
|
24 COMMAND="/var/hg/.virtualenvs/kallithea/bin/gearbox celeryd -c $APPINI -- --pidfile=$PIDFILE" |
1811
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
25 if [ -z "$GROUP" ]; then |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
26 exec sudo -u $USER $COMMAND |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
27 else |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
28 exec sudo -u $USER -g $GROUP $COMMAND |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
29 fi |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
30 end script |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
31 |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
32 post-stop script |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
33 rm -f $PIDFILE |
58df0b3ed377
Add Celery upstart file and fix post-stop for rhodecode upstart
Matt Zuba <matt.zuba@goodwillaz.org>
parents:
diff
changeset
|
34 end script |