From b37608b4a0996a1628e8571bfd8c0f5513f95218 Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <cedric@cedricbonhomme.org>
Date: Mon, 9 Jun 2014 20:31:15 +0200
Subject: Fixed a problem when running in standalone mode.

---
 bootstrap.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bootstrap.py b/bootstrap.py
index cadefcca..d13d4799 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -3,12 +3,15 @@
 import sys
 if 'threading' in sys.modules:
     raise Exception('threading module loaded before patching!')
-import gevent.monkey
-gevent.monkey.patch_thread()
-
 import conf
 import logging
 
+if not (conf.WEBSERVER_DEBUG or conf.ON_HEROKU):
+    import gevent.monkey
+    gevent.monkey.patch_thread()
+
+
+
 
 def set_logging(log_path, log_level=logging.INFO,
                 log_format='%(asctime)s %(levelname)s %(message)s'):
-- 
cgit