From 4daf30747234a8a2fb3a722432d82e4c4d0f279b Mon Sep 17 00:00:00 2001
From: Aidaho <aidaho@roxy-wi.org>
Date: Mon, 9 Oct 2023 10:21:37 +0300
Subject: [PATCH] v7.0.0.0

Changelog: https://roxy-wi.org/changelog#7.0.0
---
 app/modules/db/db_model.py |  7 -------
 app/routes/main/routes.py  | 16 ++++++++++++++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/modules/db/db_model.py b/app/modules/db/db_model.py
index 8e4d13c4..ee028beb 100644
--- a/app/modules/db/db_model.py
+++ b/app/modules/db/db_model.py
@@ -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
diff --git a/app/routes/main/routes.py b/app/routes/main/routes.py
index 8c36406c..a99ac317 100644
--- a/app/routes/main/routes.py
+++ b/app/routes/main/routes.py
@@ -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