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

Fix an error on exit caused by the cookie path patch.

Browse Source
This commit is contained in:
Khushboo Vashi
2018-03-20 13:55:06 +00:00
committed by Dave Page
parent 3bd9bdad61
commit 4942c938ac
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgAdmin4.py
View File

@@ -148,7 +148,6 @@ if __name__ == '__main__':
# Reference: # Reference:
# https://github.com/pallets/werkzeug/issues/220#issuecomment-11176538 # https://github.com/pallets/werkzeug/issues/220#issuecomment-11176538
try: try:
app.run( app.run(
host=config.DEFAULT_SERVER, host=config.DEFAULT_SERVER,
port=server_port, port=server_port,
@@ -158,8 +157,7 @@ if __name__ == '__main__':
), ),
threaded=config.THREADED_MODE threaded=config.THREADED_MODE
) )
from pgadmin.utils.paths import get_cookie_path
config.COOKIE_DEFAULT_PATH = get_cookie_path()
except IOError: except IOError:
app.logger.error("Error starting the app server: %s", sys.exc_info()) app.logger.error("Error starting the app server: %s", sys.exc_info())

9
web/pgadmin/__init__.py
View File

@@ -541,6 +541,15 @@ def create_app(app_name=None):
app.logger.info('Registering blueprint module: %s' % module) app.logger.info('Registering blueprint module: %s' % module)
app.register_blueprint(module) app.register_blueprint(module)
#########################################################################
# Set cookie path
#########################################################################
@app.before_first_request
def before_first_request():
from pgadmin.utils.paths import get_cookie_path
config.COOKIE_DEFAULT_PATH = get_cookie_path()
########################################################################## ##########################################################################
# Handle the desktop login # Handle the desktop login
########################################################################## ##########################################################################