From c312b03f6f8b61cf5e77cac019af2145db15f9f5 Mon Sep 17 00:00:00 2001 From: Murtuza Zabuawala Date: Mon, 19 Mar 2018 11:01:04 +0000 Subject: [PATCH] Pass the service name to external processes. Fixes #3195 --- web/pgadmin/misc/bgprocess/processes.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/web/pgadmin/misc/bgprocess/processes.py b/web/pgadmin/misc/bgprocess/processes.py index cefb51ac8..9737f46a2 100644 --- a/web/pgadmin/misc/bgprocess/processes.py +++ b/web/pgadmin/misc/bgprocess/processes.py @@ -630,15 +630,20 @@ class BatchProcess(object): def set_env_variables(self, server, **kwargs): """Set environment variables""" - if server and server.sslcert is not None and \ - server.sslkey is not None and \ - server.sslrootcert is not None: - # SSL environment variables - self.env['PGSSLMODE'] = server.ssl_mode - self.env['PGSSLCERT'] = get_complete_file_path(server.sslcert) - self.env['PGSSLKEY'] = get_complete_file_path(server.sslkey) - self.env['PGSSLROOTCERT'] = \ - get_complete_file_path(server.sslrootcert) + if server: + # Set SSL related ENV variables + if server.sslcert and server.sslkey and server.sslrootcert: + # SSL environment variables + self.env['PGSSLMODE'] = server.ssl_mode + self.env['PGSSLCERT'] = get_complete_file_path(server.sslcert) + self.env['PGSSLKEY'] = get_complete_file_path(server.sslkey) + self.env['PGSSLROOTCERT'] = get_complete_file_path( + server.sslrootcert + ) + + # Set service name related ENV variable + if server.service: + self.env['PGSERVICE'] = server.service if 'env' in kwargs: self.env.update(kwargs['env'])