diff options
| author | Cédric Bonhomme <kimble.mandel+bitbucket@gmail.com> | 2015-04-17 00:34:45 +0200 |
|---|---|---|
| committer | Cédric Bonhomme <kimble.mandel+bitbucket@gmail.com> | 2015-04-17 00:34:45 +0200 |
| commit | 6199b9ef59583d580f1b83afa436c0ccd60ddb76 (patch) | |
| tree | 1f5aad5dd88763f791c7d27a16ed44d1684f229d /bootstrap.py | |
| parent | 'CRAWLING_METHOD wasn't initialized on Heroku. (diff) | |
| parent | facto on config and more option in log levels (diff) | |
| download | newspipe-6199b9ef59583d580f1b83afa436c0ccd60ddb76.tar.gz newspipe-6199b9ef59583d580f1b83afa436c0ccd60ddb76.tar.bz2 newspipe-6199b9ef59583d580f1b83afa436c0ccd60ddb76.zip | |
Merged in jaesivsm/pyaggr3g470r (pull request #10)
misc fix and search integration in the new style page
Diffstat (limited to 'bootstrap.py')
| -rw-r--r-- | bootstrap.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bootstrap.py b/bootstrap.py index 9c2ce049..7a5a9b6e 100644 --- a/bootstrap.py +++ b/bootstrap.py @@ -22,13 +22,12 @@ from flask.ext.sqlalchemy import SQLAlchemy # Create Flask application application = Flask('pyaggr3g470r') -application.debug = conf.WEBSERVER_DEBUG +application.debug = conf.LOG_LEVEL <= logging.DEBUG scheme, domain, _, _, _ = urlsplit(conf.PLATFORM_URL) application.config['SERVER_NAME'] = domain application.config['PREFERRED_URL_SCHEME'] = scheme -set_logging(conf.LOG_PATH, - log_level=logging.DEBUG if conf.WEBSERVER_DEBUG else logging.INFO) +set_logging(conf.LOG_PATH, log_level=conf.LOG_LEVEL) # Create dummy secrey key so we can use sessions application.config['SECRET_KEY'] = getattr(conf, 'WEBSERVER_SECRET', None) |