aboutsummaryrefslogtreecommitdiff
path: root/bootstrap.py
diff options
context:
space:
mode:
authorFrançois Schmidts <francois.schmidts@gmail.com>2015-03-03 23:30:16 +0100
committerFrançois Schmidts <francois.schmidts@gmail.com>2015-03-03 23:30:16 +0100
commit41cb78173636e0f6f463280afdf050583dbdb3dc (patch)
tree42224fe408d3048f210b565413feb34bfe08940c /bootstrap.py
parentlast fixes (diff)
parentTypo. (diff)
downloadnewspipe-41cb78173636e0f6f463280afdf050583dbdb3dc.tar.gz
newspipe-41cb78173636e0f6f463280afdf050583dbdb3dc.tar.bz2
newspipe-41cb78173636e0f6f463280afdf050583dbdb3dc.zip
Merge remote-tracking branch 'origin/master' into evol/api
Conflicts: bootstrap.py pyaggr3g470r/models.py pyaggr3g470r/notifications.py pyaggr3g470r/rest.py
Diffstat (limited to 'bootstrap.py')
-rw-r--r--bootstrap.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/bootstrap.py b/bootstrap.py
index c5a86652..5cfd2250 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -1,18 +1,10 @@
# required imports and code exection for basic functionning
import os
-import sys
-if 'threading' in sys.modules:
- raise Exception('threading module loaded before patching!')
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.DEBUG,
+def set_logging(log_path, log_level=logging.INFO,
log_format='%(asctime)s %(levelname)s %(message)s'):
logger = logging.getLogger('pyaggr3g470r')
formater = logging.Formatter(log_format)
bgstack15