TDTP
/
sistema_web
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

patch de conexión a la db con swarm

master
ifiguero 2023-02-28 14:27:05 -03:00
parent 813490ff09
commit 9769d00e2c
5 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
login-mecanics/__init__.py
View File

@ -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')

12
private-dynamic/config.py
View File

@ -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
}

9
private-dynamic/content/main.py
View File

@ -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()

BIN
private-dynamic/static/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

12
public-dynamic/__init__.py
View File

@ -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')