aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <kimble.mandel@gmail.com>2014-04-09 10:02:01 +0200
committerCédric Bonhomme <kimble.mandel@gmail.com>2014-04-09 10:02:01 +0200
commitc06b2c87da9767957b941ef41d056fcc16fe0b26 (patch)
tree89c8b92f29c2158dde644d6e37e0fa66bfb9cc4d
parentLicense is now AGPLv3. (diff)
downloadnewspipe-c06b2c87da9767957b941ef41d056fcc16fe0b26.tar.gz
newspipe-c06b2c87da9767957b941ef41d056fcc16fe0b26.tar.bz2
newspipe-c06b2c87da9767957b941ef41d056fcc16fe0b26.zip
Fixed a bug when launching the crawler via cron.
-rw-r--r--conf.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/conf.py b/conf.py
index be99b97b..ecc85d11 100644
--- a/conf.py
+++ b/conf.py
@@ -22,6 +22,8 @@ if not ON_HEROKU:
# Whoosh does not work on Heroku
WHOOSH_ENABLED = True
+ SQLALCHEMY_DATABASE_URI = config.get('database', 'uri')
+
HTTP_PROXY = config.get('feedparser', 'http_proxy')
USER_AGENT = config.get('feedparser', 'user_agent')
RESOLVE_ARTICLE_URL = int(config.get('feedparser', 'resolve_article_url')) == 1
@@ -54,8 +56,8 @@ else:
MAIL_ENABLED = False
+ SQLALCHEMY_DATABASE_URI = os.environ['DATABASE_URL']
CSRF_ENABLED = True
-SQLALCHEMY_DATABASE_URI = os.environ['DATABASE_URL']
# slow database query threshold (in seconds)
-DATABASE_QUERY_TIMEOUT = 0.5 \ No newline at end of file
+DATABASE_QUERY_TIMEOUT = 0.5
bgstack15