public inbox for [email protected]  

help / color / mirror / Atom feed

From: Akshay Joshi <[email protected]>
To: pgadmin-hackers <[email protected]>
Subject: [Patch] Utilities not working on Windows with WSGI
Date: Thu, 18 Feb 2021 17:06:09 +0530
Message-ID: <CANxoLDf5oJhF932ifYAyFPf1K+tzBdLeUYQddY4QscL36HZYtg@mail.gmail.com> (raw)

Hi Hackers,

When we use pgAdmin on Windows with WSGI 'sys.executable' returns the path
of 'httpd.exe' instead of python interpreter. I have reverted the code only
for Windows and for other OS we use 'sys.executable'.

Attached is the patch, can someone please review it.

-- 
*Thanks & Regards*
*Akshay Joshi*
*pgAdmin Hacker | Principal Software Architect*
*EDB Postgres <http://edbpostgres.com>*

*Mobile: +91 976-788-8246*


Attachments:

  [application/octet-stream] WSGI_Windows.patch (3.7K, 3-WSGI_Windows.patch)
  download | inline diff:
diff --git a/web/pgadmin/misc/bgprocess/processes.py b/web/pgadmin/misc/bgprocess/processes.py
index 9bd8f1f9d..ef6cfc3f2 100644
--- a/web/pgadmin/misc/bgprocess/processes.py
+++ b/web/pgadmin/misc/bgprocess/processes.py
@@ -250,8 +250,20 @@ class BatchProcess(object):
             os.path.dirname(u_encode(__file__)), 'process_executor.py'
         ))
 
+        if os.name == 'nt':
+            paths = os.environ['PATH'].split(os.pathsep)
+
+            current_app.logger.info(
+                "Process Executor: Operating System Path %s",
+                str(paths)
+            )
+
+            interpreter = self.get_interpreter(paths)
+        else:
+            interpreter = sys.executable
+
         cmd = [
-            sys.executable if sys.executable is not None else 'python',
+            interpreter if interpreter is not None else 'python',
             executor, self.cmd
         ]
         cmd.extend(self.args)
@@ -361,6 +373,72 @@ class BatchProcess(object):
         # Explicitly ignoring signals in the child process
         signal.signal(signal.SIGINT, signal.SIG_IGN)
 
+    def get_interpreter(self, paths):
+        """
+        Get interpreter.
+        :param paths:
+        :return:
+        """
+        paths.insert(0, os.path.join(u_encode(sys.prefix), 'Scripts'))
+        paths.insert(0, u_encode(sys.prefix))
+
+        interpreter = self.which('pythonw.exe', paths)
+        if interpreter is None:
+            interpreter = self.which('python.exe', paths)
+
+        current_app.logger.info(
+            "Process Executor: Interpreter value in path: %s",
+            str(interpreter)
+        )
+        if interpreter is None and current_app.PGADMIN_RUNTIME:
+            # We've faced an issue with Windows 2008 R2 (x86) regarding,
+            # not honouring the environment variables set under the Qt
+            # (e.g. runtime), and also setting PYTHONHOME same as
+            # sys.executable (i.e. pgAdmin4.exe).
+            #
+            # As we know, we're running it under the runtime, we can assume
+            # that 'venv' directory will be available outside of 'bin'
+            # directory.
+            #
+            # We would try out luck to find python executable based on that
+            # assumptions.
+            bin_path = os.path.dirname(sys.executable)
+
+            venv = os.path.realpath(
+                os.path.join(bin_path, '..\\venv')
+            )
+
+            interpreter = self.which('pythonw.exe', [venv])
+            if interpreter is None:
+                interpreter = self.which('python.exe', [venv])
+
+            current_app.logger.info(
+                "Process Executor: Interpreter value in virtual "
+                "environment: %s", str(interpreter)
+            )
+
+            if interpreter is not None:
+                # Our assumptions are proven right.
+                # Let's append the 'bin' directory to the PATH environment
+                # variable. And, also set PYTHONHOME environment variable
+                # to 'venv' directory.
+                os.environ['PATH'] = bin_path + ';' + os.environ['PATH']
+                os.environ['PYTHONHOME'] = venv
+
+        return interpreter
+
+    def which(self, program, paths):
+        def is_exe(fpath):
+            return os.path.exists(fpath) and os.access(fpath, os.X_OK)
+
+        for path in paths:
+            if not os.path.isdir(path):
+                continue
+            exe_file = os.path.join(u_encode(path, fs_encoding), program)
+            if is_exe(exe_file):
+                return file_quote(exe_file)
+        return None
+
     def read_log(self, logfile, log, pos, ctime, ecode=None, enc='utf-8'):
         import re
         completed = True

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: [email protected]
  Cc: [email protected]
  Subject: Re: [Patch] Utilities not working on Windows with WSGI
  In-Reply-To: <CANxoLDf5oJhF932ifYAyFPf1K+tzBdLeUYQddY4QscL36HZYtg@mail.gmail.com>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox