public inbox for [email protected]
help / color / mirror / Atom feedFrom: Murtuza Zabuawala <[email protected]>
To: pgadmin-hackers <[email protected]>
Subject: [pgAdmin4][RM#3195] Include service name when executing Backup, Restore etc tools
Date: Thu, 15 Mar 2018 21:45:53 +0530
Message-ID: <CAKKotZT9Nt97eEoXHbzZBnmsyw9rFrrKHW3+-NKRGO--vh_K=A@mail.gmail.com> (raw)
Hi,
PFA patch which will allow tools to pickup Service name properly.
Please review.
--
Regards,
Murtuza Zabuawala
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
Attachments:
[application/octet-stream] RM_3195.diff (1.6K, 3-RM_3195.diff)
download | inline diff:
diff --git a/web/pgadmin/misc/bgprocess/processes.py b/web/pgadmin/misc/bgprocess/processes.py
index cefb51a..9737f46 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'])
view thread (4+ messages) latest in thread
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: [pgAdmin4][RM#3195] Include service name when executing Backup, Restore etc tools
In-Reply-To: <CAKKotZT9Nt97eEoXHbzZBnmsyw9rFrrKHW3+-NKRGO--vh_K=A@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