Skip to content

Commit c6ec1eb

Browse files
committed
Merge pull request #3094 from mboersma/process-titling
feat(controller): worker processes named as "deis-controller"
2 parents 070ead2 + cbb9fa1 commit c6ec1eb

3 files changed

Lines changed: 11 additions & 3 deletions

File tree

controller/bin/boot

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@ chmod 777 /data/logs
7171
sudo -E -u deis ./manage.py syncdb --migrate --noinput
7272

7373
# spawn a gunicorn server in the background
74-
sudo -E -u deis gunicorn deis.wsgi -b 0.0.0.0 -w 8 -n deis --timeout=1200 --pid=/tmp/gunicorn.pid \
75-
--log-level info --error-logfile - --access-logfile - \
76-
--access-logformat '%(h)s "%(r)s" %(s)s %(b)s "%(a)s"' &
74+
sudo -E -u deis gunicorn -c deis/gconf.py deis.wsgi &
7775

7876
# smart shutdown on SIGINT and SIGTERM
7977
function on_exit() {

controller/deis/gconf.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
bind = '0.0.0.0'
2+
workers = 8
3+
proc_name = 'deis-controller'
4+
timeout = 1200
5+
pidfile = '/tmp/gunicorn.pid'
6+
loglevel = 'info'
7+
errorlog = '-'
8+
accesslog = '-'
9+
access_log_format = '%(h)s "%(r)s" %(s)s %(b)s "%(a)s"'

controller/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ paramiko==1.15.2
1616
psycopg2==2.6
1717
python-etcd==0.3.2
1818
PyYAML==3.11
19+
setproctitle==1.1.8
1920
static==1.1.1
2021
South==1.0.2

0 commit comments

Comments
 (0)