Ensure SSL options are pushed down to external tools like pg_dump. Fixes #3122

This commit is contained in:
Khushboo Vashi
2018-03-15 07:35:47 -04:00
committed by Dave Page
parent 53ae960aeb
commit 63ba3402e8
5 changed files with 33 additions and 8 deletions

View File

@@ -300,6 +300,7 @@ def create_backup_job(sid):
'--database',
server.maintenance_db
]
if 'role' in data and data['role']:
args.append('--role')
args.append(data['role'])
@@ -323,6 +324,7 @@ def create_backup_job(sid):
cmd=utility, args=args
)
manager.export_password_env(p.id)
p.set_env_variables(server)
p.start()
jid = p.id
except Exception as e:
@@ -486,6 +488,7 @@ def create_backup_objects_job(sid):
cmd=utility, args=args
)
manager.export_password_env(p.id)
p.set_env_variables(server)
p.start()
jid = p.id
except Exception as e:

View File

@@ -307,13 +307,13 @@ def create_import_export_job(sid):
)
manager.export_password_env(p.id)
def export_pg_env(env):
env['PGHOST'] = server.host
env['PGPORT'] = str(server.port)
env['PGUSER'] = server.username
env['PGDATABASE'] = data['database']
p.start(export_pg_env)
env = dict()
env['PGHOST'] = server.host
env['PGPORT'] = str(server.port)
env['PGUSER'] = server.username
env['PGDATABASE'] = data['database']
p.set_env_variables(server, env=env)
p.start()
jid = p.id
except Exception as e:
current_app.logger.exception(e)

View File

@@ -236,6 +236,7 @@ def create_maintenance_job(sid, did):
cmd=utility, args=args
)
manager.export_password_env(p.id)
p.set_env_variables(server)
p.start()
jid = p.id
except Exception as e:

View File

@@ -329,6 +329,7 @@ def create_restore_job(sid):
cmd=utility, args=args
)
manager.export_password_env(p.id)
p.set_env_variables(server)
p.start()
jid = p.id
except Exception as e: