aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2014-06-09 20:31:15 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2014-06-09 20:31:15 +0200
commitb37608b4a0996a1628e8571bfd8c0f5513f95218 (patch)
treef75682ef3313be8394f910f8bc8200629988b93b
parentMerged in jaesivsm/pyaggr3g470r (pull request #2) (diff)
downloadnewspipe-b37608b4a0996a1628e8571bfd8c0f5513f95218.tar.gz
newspipe-b37608b4a0996a1628e8571bfd8c0f5513f95218.tar.bz2
newspipe-b37608b4a0996a1628e8571bfd8c0f5513f95218.zip
Fixed a problem when running in standalone mode.
-rw-r--r--bootstrap.py9
1 files 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'):
bgstack15