Commit dad5563c authored by Nicola Soranzo's avatar Nicola Soranzo
Browse files

Merge branch 'release_16.01' into release_16.04

parents 2528a89b 2207e7f8
......@@ -32,8 +32,10 @@ log = logging.getLogger( __name__ )
# uwsgi-managed process.
import uwsgi
if uwsgi.numproc:
if hasattr(uwsgi, "numproc"):
process_is_uwsgi = True
process_is_uwsgi = False
except ImportError:
# This is not a uwsgi process, or something went horribly wrong.
process_is_uwsgi = False
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment