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

Improve detection of the runtime environment, and subsequent self-configuration.

Browse Source
This commit is contained in:
Dave Page
2016-06-17 10:03:32 +01:00
parent 4dc563d71c
commit 262ae7d28c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
web/pgAdmin4.py
View File

@@ -60,17 +60,20 @@ else:
# Start the web server. The port number should have already been set by the # Start the web server. The port number should have already been set by the
# runtime if we're running in desktop mode, otherwise we'll just use the # runtime if we're running in desktop mode, otherwise we'll just use the
# Flask default. # Flask default.
PGADMIN_RUNTIME = False
if 'PGADMIN_PORT' in globals(): if 'PGADMIN_PORT' in globals():
app.logger.debug('PGADMIN_PORT set in the runtime environment to %s', app.logger.debug('Running under the desktop runtime, port: %s',
globals()['PGADMIN_PORT']) globals()['PGADMIN_PORT'])
server_port = int(globals()['PGADMIN_PORT']) server_port = int(globals()['PGADMIN_PORT'])
PGADMIN_RUNTIME = True
else: else:
app.logger.debug( app.logger.debug(
'PGADMIN_PORT is not set in the runtime environment, using default of %s', 'Not running under the desktop runtime, port: %s',
config.DEFAULT_SERVER_PORT) config.DEFAULT_SERVER_PORT)
server_port = config.DEFAULT_SERVER_PORT server_port = config.DEFAULT_SERVER_PORT
if config.SERVER_MODE == True: # Output a startup message if we're not under the runtime
if not PGADMIN_RUNTIME:
print("Starting %s. Please navigate to http://localhost:%d in your browser." % print("Starting %s. Please navigate to http://localhost:%d in your browser." %
(config.APP_NAME, server_port)) (config.APP_NAME, server_port))
sys.stdout.flush() sys.stdout.flush()
@@ -79,7 +82,7 @@ try:
app.run( app.run(
host=config.DEFAULT_SERVER, host=config.DEFAULT_SERVER,
port=server_port, port=server_port,
use_reloader=(config.SERVER_MODE and app.debug), use_reloader=((not PGADMIN_RUNTIME) and app.debug),
threaded=config.THREADED_MODE threaded=config.THREADED_MODE
) )
except IOError: except IOError: