celeryd_detach: Removed support for --chroot

celery/bin/celeryd_detach.py

@@ -25,16 +25,13 @@ OPTION_LIST = (
         Option('--workdir', default=None,
                action="store", dest="working_directory",
                help="Directory to change to when detached."),
-        Option('--chroot', default=None,
-               action="store", dest="chroot_directory",
-               help="Change root directory to this path when detached."),
 )
 
 
 class detached(object):
 
     def __init__(self, path, argv, logfile=None, pidfile=None, uid=None,
-            gid=None, umask=0, working_directory=None, chroot_directory=None):
+            gid=None, umask=0, working_directory=None):
         self.path = path
         self.argv = argv
         self.logfile = logfile
@@ -43,7 +40,6 @@ class detached(object):
         self.gid = gid
         self.umask = umask
         self.working_directory = working_directory
-        self.chroot_directory = chroot_directory
 
     def start(self):
         context, on_stop = create_daemon_context(
@@ -52,8 +48,7 @@ class detached(object):
                                 uid=self.uid,
                                 gid=self.gid,
                                 umask=self.umask,
-                                working_directory=self.working_directory,
-                                chroot_directory=self.chroot_directory)
+                                working_directory=self.working_directory)
         context.open()
         try:
             os.execv(self.path, [self.path] + self.argv)

celery/platforms.py

@@ -137,9 +137,8 @@ def create_pidlock(pidfile):
 class DaemonContext(object):
     _is_open = False
 
-    def __init__(self, pidfile=None, chroot_directory=None,
+    def __init__(self, pidfile=None,
             working_directory=DAEMON_WORKDIR, umask=DAEMON_UMASK, **kwargs):
-        self.chroot_directory = chroot_directory
         self.working_directory = working_directory
         self.umask = umask
 
@@ -157,9 +156,6 @@ class DaemonContext(object):
 
         self.detach()
 
-        if self.chroot_directory is not None:
-            os.chdir(self.chroot_directory)
-            os.chroot(self.chroot_directory)
         os.chdir(self.working_directory)
         os.umask(self.umask)
 
@@ -199,7 +195,6 @@ def create_daemon_context(logfile=None, pidfile=None, **options):
         create_pidlock(pidfile)
 
     defaults = {"umask": lambda: 0,
-                "chroot_directory": lambda: None,
                 "working_directory": lambda: os.getcwd()}
 
     for opt_name, opt_default_gen in defaults.items():