From d47cb94ade20c72c4d5de5fd9274f521f8dbf381 Mon Sep 17 00:00:00 2001
From: Jeremy Orem <jeremy.orem@gmail.com>
Date: Wed, 15 Sep 2010 13:37:43 -0700
Subject: [PATCH] Add user and group options to celerydaemon command.

---
 .../management/commands/celerydaemon.py       | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/apps/extras/management/commands/celerydaemon.py b/apps/extras/management/commands/celerydaemon.py
index bd5109014e..d40da5e1f7 100644
--- a/apps/extras/management/commands/celerydaemon.py
+++ b/apps/extras/management/commands/celerydaemon.py
@@ -1,3 +1,5 @@
+import grp
+import pwd
 from optparse import make_option
 
 from django.core.management.base import BaseCommand
@@ -9,7 +11,11 @@ from celery.bin.celeryd import run_worker, OPTION_LIST
 
 opts = list(BaseCommand.option_list +
             filter(lambda o: '--version' not in o._long_opts, OPTION_LIST))
-opts.append(make_option('--pidfile'))
+opts.extend([
+    make_option('--pidfile'),
+    make_option('--user', help='Run celery as this user'),
+    make_option('--group', help='Run celery as this group'),
+])
 
 
 class Command(BaseCommand):
@@ -18,10 +24,16 @@ class Command(BaseCommand):
     option_list = opts
 
     def handle(self, *args, **opts):
-        pidfile = None
+        pidfile = uid = gid = None
+
         if opts['pidfile']:
             pidfile = daemon.pidlockfile.PIDLockFile(opts['pidfile'])
-            del opts['pidfile']
+        if opts['user']:
+            uid = pwd.getpwnam(opts['user']).pw_uid
+        if opts['group']:
+            gid = grp.getgrnam(opts['group']).gr_gid
 
-        with daemon.DaemonContext(pidfile=pidfile):
+        del opts['pidfile'], opts['group'], opts['user']
+
+        with daemon.DaemonContext(pidfile=pidfile, uid=uid, gid=gid):
             run_worker(**opts)