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

Pass the service name to external processes. Fixes #3195

Browse Source
This commit is contained in:
Murtuza Zabuawala 2018-03-19 11:01:04 +00:00 committed by Dave Page
parent 9ea118ca57
commit c312b03f6f
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
web/pgadmin/misc/bgprocess/processes.py
View File

@ -630,15 +630,20 @@ class BatchProcess(object):
def set_env_variables(self, server, **kwargs): def set_env_variables(self, server, **kwargs):
"""Set environment variables""" """Set environment variables"""
if server and server.sslcert is not None and \ if server:
server.sslkey is not None and \ # Set SSL related ENV variables
server.sslrootcert is not None: if server.sslcert and server.sslkey and server.sslrootcert:
# SSL environment variables # SSL environment variables
self.env['PGSSLMODE'] = server.ssl_mode self.env['PGSSLMODE'] = server.ssl_mode
self.env['PGSSLCERT'] = get_complete_file_path(server.sslcert) self.env['PGSSLCERT'] = get_complete_file_path(server.sslcert)
self.env['PGSSLKEY'] = get_complete_file_path(server.sslkey) self.env['PGSSLKEY'] = get_complete_file_path(server.sslkey)
self.env['PGSSLROOTCERT'] = \ self.env['PGSSLROOTCERT'] = get_complete_file_path(
get_complete_file_path(server.sslrootcert) server.sslrootcert
)
# Set service name related ENV variable
if server.service:
self.env['PGSERVICE'] = server.service
if 'env' in kwargs: if 'env' in kwargs:
self.env.update(kwargs['env']) self.env.update(kwargs['env'])