Changelog: https://roxy-wi.org/changelog#7.0.0
pull/364/head
Aidaho 2023-10-09 10:21:37 +03:00
parent 658f524d18
commit 4daf307472
2 changed files with 14 additions and 9 deletions

View File

@ -3,7 +3,6 @@ from playhouse.migrate import *
from datetime import datetime
from flask_login import UserMixin
from app import app
import modules.roxy_wi_tools as roxy_wi_tools
get_config = roxy_wi_tools.GetConfigVar()
@ -23,12 +22,6 @@ else:
migrator = SqliteMigrator(conn)
@app.teardown_request
def _db_close(exc):
if not conn.is_closed():
conn.close()
class BaseModel(Model):
class Meta:
database = conn

View File

@ -2,14 +2,15 @@ import os
import sys
import pytz
from flask import render_template, request, redirect, url_for
from flask import render_template, request, redirect, url_for, session
from flask_login import login_required
sys.path.append(os.path.join(sys.path[0], '/var/www/haproxy-wi/app'))
from app import cache
from app import app, cache
from app.routes.main import bp
import modules.db.sql as sql
from modules.db.db_model import conn
import modules.common.common as common
import modules.roxywi.roxy as roxy
import modules.roxywi.auth as roxywi_auth
@ -19,6 +20,17 @@ import modules.service.common as service_common
import modules.service.haproxy as service_haproxy
@app.before_request
def make_session_permanent():
session.permanent = True
@app.teardown_request
def _db_close(exc):
if not conn.is_closed():
conn.close()
@bp.errorhandler(404)
def page_not_found(e):
return render_template('404.html'), 404