IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue where the create_app() function was called twice if an SQLite database file was not present.

Browse Source 
Remove the exec call to run the 'setup.py' instead call the setup database function directly.
This commit is contained in:
Akshay Joshi
2022-07-01 14:50:12 +05:30
parent 9c745db413
commit bf7de8e7a5
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
web/pgAdmin4.py
View File

@@ -13,7 +13,7 @@ to start a web server."""
import sys
import setup
if sys.version_info < (3, 4):
raise RuntimeError('This application must be run under Python 3.4 '
@@ -82,14 +82,6 @@ class ReverseProxied(object):
##########################################################################
config.SETTINGS_SCHEMA_VERSION = SCHEMA_VERSION
# Check if the database exists. If it does not, create it.
if not os.path.isfile(config.SQLITE_PATH):
setup_py = os.path.join(
os.path.dirname(os.path.realpath(u_encode(__file__, fs_encoding))),
'setup.py'
)
exec(open(file_quote(setup_py), 'r').read())
##########################################################################
# Create the app and configure it. It is created outside main so that
@@ -99,6 +91,10 @@ app = create_app()
app.debug = False
app.config['sessions'] = dict()
# Check if the database exists. If it does not, create it.
if not os.path.isfile(config.SQLITE_PATH):
setup.setup_db(app)
if config.SERVER_MODE:
app.wsgi_app = ReverseProxied(app.wsgi_app)