Merge branch 'release_16.04' into release_16.07

Conflicts: lib/galaxy/config.py
galaxyproject · Sep 6, 2017 · 4345d8e · 4345d8e
2 parents 5a39d47 + dad5563
commit 4345d8e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/galaxy/util/postfork.py b/lib/galaxy/util/postfork.py
@@ -7,8 +7,10 @@
 # uwsgi-managed process.
 try:
     import uwsgi
-    if uwsgi.numproc:
+    if hasattr(uwsgi, "numproc"):
         process_is_uwsgi = True
+    else:
+        process_is_uwsgi = False
 except ImportError:
     # This is not a uwsgi process, or something went horribly wrong.
     process_is_uwsgi = False