fixing zombie daemons

sqlshare_rest/util/dataset_queue.py

@@ -73,7 +73,9 @@ def start_upload(upload, background=True):
             from django.db import connection
             connection.close()
 
-            if os.fork():
+            pid1 = os.fork()
+            if pid1:
+                os.waitpid(pid1, 0)
                 # This is the main process
                 return
 

sqlshare_rest/util/query_queue.py

@@ -41,7 +41,9 @@ def start_query(query, background=True):
             from django.db import connection
             connection.close()
 
-            if os.fork():
+            pid1 = os.fork()
+            if pid1:
+                os.waitpid(pid1, 0)
                 # This is the main process
                 return
 
@@ -51,16 +53,6 @@ def start_query(query, background=True):
                 # Double fork the daemon
                 sys.exit(0)
 
-            # Close stdin/out/err
-            sys.stdin.flush()
-            sys.stdout.flush()
-            sys.stderr.flush()
-            null = os.open(os.devnull, os.O_RDWR)
-            os.dup2(null, sys.stdin.fileno())
-            os.dup2(null, sys.stdout.fileno())
-            os.dup2(null, sys.stderr.fileno())
-            os.close(null)
-
         try:
             process_query(query_id)
         except Exception as ex:

sqlshare_rest/util/snapshot_queue.py

@@ -35,7 +35,9 @@ def start_snapshot(snapshot, background=True):
             from django.db import connection
             connection.close()
 
-            if os.fork():
+            pid1 = os.fork()
+            if pid1:
+                os.waitpid(pid1, 0)
                 # This is the main process
                 return