diff --git a/login-mecanics/__init__.py b/login-mecanics/__init__.py index af6a3e2..6f06c22 100644 --- a/login-mecanics/__init__.py +++ b/login-mecanics/__init__.py @@ -19,18 +19,13 @@ class Config: DEBUG = os.environ.get('DEBUG') SESSION_COOKIE_DOMAIN = os.environ.get('COOKIE_DOMAIN') SQLALCHEMY_DATABASE_URI = os.environ.get('SQLALCHEMY_WEBDB_URI') - SQLALCHEMY_BINDS = { - 'system': os.environ.get('SQLALCHEMY_WEBDB_URI'), - 'gtfs_work': os.environ.get('SQLALCHEMY_HOTDB_URI'), - 'gtfs_static': os.environ.get('SQLALCHEMY_GTFSDB_URI'), + 'system': {'url': os.environ.get('SQLALCHEMY_WEBDB_URI'), 'pool_recycle': 60, 'echo_pool': True }, + 'gtfs_work':{'url': os.environ.get('SQLALCHEMY_HOTDB_URI'), 'pool_recycle': 60, 'echo_pool': True }, + 'gtfs_static':{'url': os.environ.get('SQLALCHEMY_GTFSDB_URI'), 'pool_recycle': 60, 'echo_pool': True }, } MAIL_DEBUG = int(os.environ.get('DEBUG') == True) - SQLALCHEMY_ENGINE_OPTIONS = { - 'pool_size': 2, - 'pool_recycle': 300, - 'pool_pre_ping': True - } + #if sys.version_info.major < 3: # reload(sys) #sys.setdefaultencoding('utf8') diff --git a/private-dynamic/config.py b/private-dynamic/config.py index 2f93489..a170ea6 100644 --- a/private-dynamic/config.py +++ b/private-dynamic/config.py @@ -7,18 +7,12 @@ class Config: DEBUG = os.environ.get('DEBUG') SESSION_COOKIE_DOMAIN = os.environ.get('COOKIE_DOMAIN') SQLALCHEMY_DATABASE_URI = os.environ.get('SQLALCHEMY_WEBDB_URI') - SQLALCHEMY_BINDS = { - 'system': os.environ.get('SQLALCHEMY_WEBDB_URI'), - 'gtfs_work': os.environ.get('SQLALCHEMY_HOTDB_URI'), - 'gtfs_static': os.environ.get('SQLALCHEMY_GTFSDB_URI'), + 'system': {'url': os.environ.get('SQLALCHEMY_WEBDB_URI'), 'pool_recycle': 60, 'echo_pool': True }, + 'gtfs_work':{'url': os.environ.get('SQLALCHEMY_HOTDB_URI'), 'pool_recycle': 60, 'echo_pool': True }, + 'gtfs_static':{'url': os.environ.get('SQLALCHEMY_GTFSDB_URI'), 'pool_recycle': 60, 'echo_pool': True }, } MAIL_DEBUG = int(os.environ.get('DEBUG') == True) MAIL_SERVER = os.environ.get('MAIL_SERVER') MAIL_PORT = os.environ.get('MAIL_PORT') - SQLALCHEMY_ENGINE_OPTIONS = { - 'pool_size': 2, - 'pool_recycle': 300, - 'pool_pre_ping': True - } diff --git a/private-dynamic/content/main.py b/private-dynamic/content/main.py index 9bbd7a1..9420d1f 100644 --- a/private-dynamic/content/main.py +++ b/private-dynamic/content/main.py @@ -1,5 +1,5 @@ # coding: utf-8 -from flask import render_template, flash, redirect, url_for, request, Blueprint, session as httpsession, g, current_app +from flask import render_template, flash, redirect, url_for, request, Blueprint, session as httpsession, g, current_app, send_from_directory from flask_login import login_user, current_user, logout_user, login_required from user_agents import parse from webinterface import db, bcrypt @@ -9,7 +9,7 @@ from webinterface.models.gestion import Comision, Miembro, Objetivo from .utils import es_local import datetime import markdown2 - +import os ## Core provee la funcionalidad basica de autentificación usando las credenciales de iLab main = Blueprint('main', __name__) @@ -43,10 +43,11 @@ def login(): def logout(): return redirect('https://tpmc.ilab.cl/system/logout') -@main.before_app_first_request +#@main.before_app_first_request def init_database(): + pass try: -# db.drop_all() + db.drop_all() db.create_all() id_internet = Identidad.query.filter(Identidad.login=='Internet').one_or_none() diff --git a/private-dynamic/static/favicon.ico b/private-dynamic/static/favicon.ico index dddefa7..b28adaf 100644 Binary files a/private-dynamic/static/favicon.ico and b/private-dynamic/static/favicon.ico differ diff --git a/public-dynamic/__init__.py b/public-dynamic/__init__.py index 9d3d77f..a2b1eec 100644 --- a/public-dynamic/__init__.py +++ b/public-dynamic/__init__.py @@ -15,18 +15,12 @@ class Config: DEBUG = os.environ.get('DEBUG') SESSION_COOKIE_DOMAIN = os.environ.get('COOKIE_DOMAIN') SQLALCHEMY_DATABASE_URI = os.environ.get('SQLALCHEMY_WEBDB_URI') - SQLALCHEMY_BINDS = { - 'system': os.environ.get('SQLALCHEMY_WEBDB_URI'), - 'gtfs_work': os.environ.get('SQLALCHEMY_HOTDB_URI'), - 'gtfs_static': os.environ.get('SQLALCHEMY_GTFSDB_URI'), + 'system': {'url': os.environ.get('SQLALCHEMY_WEBDB_URI'), 'pool_recycle': 60, 'echo_pool': True }, + 'gtfs_work':{'url': os.environ.get('SQLALCHEMY_HOTDB_URI'), 'pool_recycle': 60, 'echo_pool': True }, + 'gtfs_static':{'url': os.environ.get('SQLALCHEMY_GTFSDB_URI'), 'pool_recycle': 60, 'echo_pool': True }, } MAIL_DEBUG = int(os.environ.get('DEBUG') == True) - SQLALCHEMY_ENGINE_OPTIONS = { - 'pool_size': 2, - 'pool_recycle': 300, - 'pool_pre_ping': True - } #if sys.version_info.major < 3: # reload(sys) #sys.setdefaultencoding('utf8')