From bfe1b773b38e3c55712c781cb93eb21fe3a97842 Mon Sep 17 00:00:00 2001 From: Ashesh Vashi Date: Mon, 20 Jun 2016 22:00:13 +0530 Subject: [PATCH] Do not rely on config.SERVER_MODE for determining (if it is running from runtime, or time), instead check the environment variable PGADMIN_PORT to do that as per Dave. --- web/pgadmin/misc/bgprocess/processes.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/web/pgadmin/misc/bgprocess/processes.py b/web/pgadmin/misc/bgprocess/processes.py index b4184a8a7..e3d68b54a 100644 --- a/web/pgadmin/misc/bgprocess/processes.py +++ b/web/pgadmin/misc/bgprocess/processes.py @@ -33,6 +33,13 @@ if sys.version_info < (3,): else: from io import StringIO +# The port number should have already been set by the runtime if we're running +# in desktop mode. +PGADMIN_RUNTIME = False + +if 'PGADMIN_PORT' in globals(): + PGADMIN_RUNTIME = True + def get_current_time(format='%Y-%m-%d %H:%M:%S.%f %z'): """ @@ -181,7 +188,7 @@ class BatchProcess(object): p = None cmd = [ - (sys.executable if config.SERVER_MODE else + (sys.executable if not PGADMIN_RUNTIME else 'pythonw.exe' if os.name == 'nt' else 'python'), executor, '-p', self.id,