From 2849c82255b4b889c7342a0a8fa8a4aecfbe599d Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Sat, 17 Jan 2015 16:50:38 +0100 Subject: a first big refacto of the existing arch --- bootstrap.py | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'bootstrap.py') diff --git a/bootstrap.py b/bootstrap.py index d13d4799..bb1d1278 100644 --- a/bootstrap.py +++ b/bootstrap.py @@ -1,5 +1,6 @@ # required imports and code exection for basic functionning +import os import sys if 'threading' in sys.modules: raise Exception('threading module loaded before patching!') @@ -11,8 +12,6 @@ if not (conf.WEBSERVER_DEBUG or conf.ON_HEROKU): gevent.monkey.patch_thread() - - def set_logging(log_path, log_level=logging.INFO, log_format='%(asctime)s %(levelname)s %(message)s'): logger = logging.getLogger('pyaggr3g470r') @@ -23,3 +22,23 @@ def set_logging(log_path, log_level=logging.INFO, logger.setLevel(log_level) set_logging(conf.LOG_PATH) + +from flask import Flask +from flask.ext.sqlalchemy import SQLAlchemy + +# Create Flask application +application = Flask(__name__, static_folder='pyaggr3g470r/static', + template_folder='pyaggr3g470r/templates') +application.debug = conf.WEBSERVER_DEBUG + +# Create dummy secrey key so we can use sessions +application.config['SECRET_KEY'] = getattr(conf, 'WEBSERVER_SECRET', None) +if not application.config['SECRET_KEY']: + application.config['SECRET_KEY'] = os.urandom(12) +application.config['SQLALCHEMY_DATABASE_URI'] = conf.SQLALCHEMY_DATABASE_URI + +application.config['RECAPTCHA_USE_SSL'] = True +application.config['RECAPTCHA_PUBLIC_KEY'] = conf.RECAPTCHA_PUBLIC_KEY +application.config['RECAPTCHA_PRIVATE_KEY'] = conf.RECAPTCHA_PRIVATE_KEY + +db = SQLAlchemy(application) -- cgit From 4f0ad9e442e64f69d420dea4d737805eefaaf981 Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Wed, 21 Jan 2015 14:07:00 +0100 Subject: continuing refacto --- bootstrap.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'bootstrap.py') diff --git a/bootstrap.py b/bootstrap.py index bb1d1278..b9435d5c 100644 --- a/bootstrap.py +++ b/bootstrap.py @@ -27,8 +27,7 @@ from flask import Flask from flask.ext.sqlalchemy import SQLAlchemy # Create Flask application -application = Flask(__name__, static_folder='pyaggr3g470r/static', - template_folder='pyaggr3g470r/templates') +application = Flask('pyaggr3g470r') application.debug = conf.WEBSERVER_DEBUG # Create dummy secrey key so we can use sessions -- cgit From 5572851eca3b2f1bc56aed7232284acc436d2f49 Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Sun, 1 Mar 2015 03:20:12 +0100 Subject: new crawler with cache control and error handling --- bootstrap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.py') diff --git a/bootstrap.py b/bootstrap.py index b9435d5c..5d599146 100644 --- a/bootstrap.py +++ b/bootstrap.py @@ -12,7 +12,7 @@ if not (conf.WEBSERVER_DEBUG or conf.ON_HEROKU): gevent.monkey.patch_thread() -def set_logging(log_path, log_level=logging.INFO, +def set_logging(log_path, log_level=logging.DEBUG, log_format='%(asctime)s %(levelname)s %(message)s'): logger = logging.getLogger('pyaggr3g470r') formater = logging.Formatter(log_format) -- cgit From a4fb151ea53d8054cc8e3fb309395c8fa0e23aaf Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Sun, 1 Mar 2015 14:08:02 +0100 Subject: fixing/restoring logging level --- bootstrap.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bootstrap.py') diff --git a/bootstrap.py b/bootstrap.py index 5d599146..83862640 100644 --- a/bootstrap.py +++ b/bootstrap.py @@ -21,14 +21,14 @@ def set_logging(log_path, log_level=logging.DEBUG, logger.addHandler(handler) logger.setLevel(log_level) -set_logging(conf.LOG_PATH) - from flask import Flask from flask.ext.sqlalchemy import SQLAlchemy # Create Flask application application = Flask('pyaggr3g470r') application.debug = conf.WEBSERVER_DEBUG +set_logging(conf.LOG_PATH, log_level=logging.DEBUG if conf.WEBSERVER_DEBUG + else logging.INFO) # Create dummy secrey key so we can use sessions application.config['SECRET_KEY'] = getattr(conf, 'WEBSERVER_SECRET', None) -- cgit From a5c180322fdb1cc249743b5d194f13b926e9303f Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Mon, 2 Mar 2015 12:23:39 +0100 Subject: fixing db_create script, migrating it to the manager --- bootstrap.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'bootstrap.py') diff --git a/bootstrap.py b/bootstrap.py index 83862640..c5a86652 100644 --- a/bootstrap.py +++ b/bootstrap.py @@ -41,3 +41,8 @@ application.config['RECAPTCHA_PUBLIC_KEY'] = conf.RECAPTCHA_PUBLIC_KEY application.config['RECAPTCHA_PRIVATE_KEY'] = conf.RECAPTCHA_PRIVATE_KEY db = SQLAlchemy(application) + +def populate_g(): + from flask import g + g.db = db + g.app = application -- cgit