Refactoring: common stdin </dev/null.

Author: javabrett

gunicorn/util.py

@@ -472,44 +472,37 @@ def daemonize(enable_stdio_inheritance=False):
 
         os.umask(0o22)
 
+        # Always redirect stdin to /dev/null as we would
+        # never expect to need to read interactive input.
+
+        os.close(0)
+
+        fd_null = os.open(REDIRECT_TO, os.O_RDWR)
+        # PEP 446, make fd for /dev/null inheritable
+        os.set_inheritable(fd_null, True)
+
+        # expect fd_null to be always 0 here, but in-case not ...
+        if fd_null != 0:
+            os.dup2(fd_null, 0)
+
         # In both the following any file descriptors above stdin
         # stdout and stderr are left untouched. The inheritance
         # option simply allows one to have output go to a file
         # specified by way of shell redirection when not wanting
         # to use --error-log option.
 
         if not enable_stdio_inheritance:
-            # Remap all of stdin, stdout and stderr on to
+            # Remap remaining fds stdout and stderr on to
             # /dev/null. The expectation is that users have
             # specified the --error-log option.
 
-            closerange(0, 3)
-
-            fd_null = os.open(REDIRECT_TO, os.O_RDWR)
-            # PEP 446, make fd for /dev/null inheritable
-            os.set_inheritable(fd_null, True)
-
-            # expect fd_null to be always 0 here, but in-case not ...
-            if fd_null != 0:
-                os.dup2(fd_null, 0)
+            # 1/stdout, 2/stderr - 0/stdin already done above
+            closerange(1, 3)
 
             os.dup2(fd_null, 1)
             os.dup2(fd_null, 2)
 
         else:
-            # Always redirect stdin to /dev/null as we would
-            # never expect to need to read interactive input.
-
-            os.close(0)
-
-            fd_null = os.open(REDIRECT_TO, os.O_RDWR)
-            # PEP 446, make fd for /dev/null inheritable
-            os.set_inheritable(fd_null, True)
-
-            # expect fd_null to be always 0 here, but in-case not ...
-            if fd_null != 0:
-                os.dup2(fd_null, 0)
-
             # If stdout and stderr are still connected to
             # their original file descriptors we check to see
             # if they are associated with terminal devices.