Ticket #6687: fastcgi-log-routing.diff

django/core/servers/fastcgi.py

@@ -38 +38 @@
-  daemonize=BOOL       whether to detach from terminal.
-  pidfile=FILE         write the spawned process-id to this file.
-  workdir=DIRECTORY    change to this directory when daemonizing
+  outlog=FILE          write stdout to this file
+  errlog=FILE          write stderr to this file
-
-Examples:
-  Run a "standard" fastcgi process on a file-descriptor
@@ -69 +71 @@
-    'minspare': 2,
-    'maxchildren': 50,
-    'maxrequests': 0,
+    'outlog': None,
+    'errlog': None,
-}
-
-def fastcgi_help(message=None):
@@ -150 +154 @@
-        else:
-            return fastcgi_help("ERROR: Invalid option for daemonize parameter.")
-
+    daemon_kwargs = {}
+    if options['outlog']:
+        daemon_kwargs['out_log'] = options['outlog']
+    if options['errlog']:
+        daemon_kwargs['err_log'] = options['errlog']
+
-    if daemonize:
-        from django.utils.daemonize import become_daemon
-
+, **daemon_kwargs
-
-    if options["pidfile"]:
-        fp = open(options["pidfile"], "w")

django/utils/daemonize.py

@@ -29 +29 @@
-        os.dup2(si.fileno(), sys.stdin.fileno())
-        os.dup2(so.fileno(), sys.stdout.fileno())
-        os.dup2(se.fileno(), sys.stderr.fileno())
+        # set the custom file descriptors for python so they have correct buffering
+        sys.stdout, sys.stderr = so, se
-else:
-    def become_daemon(our_home_dir='.', out_log=None, err_log=None):
-        """