public inbox for [email protected]
help / color / mirror / Atom feed[pgAdmin4][RM#3195] Include service name when executing Backup, Restore etc tools
4+ messages / 3 participants
[nested] [flat]
* [pgAdmin4][RM#3195] Include service name when executing Backup, Restore etc tools
@ 2018-03-15 16:15 Murtuza Zabuawala <[email protected]>
2018-03-15 20:55 ` Re: [pgAdmin4][RM#3195] Include service name when executing Backup, Restore etc tools Victoria Henry <[email protected]>
2018-03-19 11:01 ` Re: [pgAdmin4][RM#3195] Include service name when executing Backup, Restore etc tools Dave Page <[email protected]>
0 siblings, 2 replies; 4+ messages in thread
From: Murtuza Zabuawala @ 2018-03-15 16:15 UTC (permalink / raw)
To: pgadmin-hackers
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'])
^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: [pgAdmin4][RM#3195] Include service name when executing Backup, Restore etc tools
2018-03-15 16:15 [pgAdmin4][RM#3195] Include service name when executing Backup, Restore etc tools Murtuza Zabuawala <[email protected]>
@ 2018-03-15 20:55 ` Victoria Henry <[email protected]>
2018-03-16 03:49 ` Re: [pgAdmin4][RM#3195] Include service name when executing Backup, Restore etc tools Murtuza Zabuawala <[email protected]>
1 sibling, 1 reply; 4+ messages in thread
From: Victoria Henry @ 2018-03-15 20:55 UTC (permalink / raw)
To: Murtuza Zabuawala <[email protected]>; +Cc: pgadmin-hackers
Hey Murtuza,
This patch passed our test pipelines and it looks good.
Do we have any tests around this behavior?
Joao and Victoria
^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: [pgAdmin4][RM#3195] Include service name when executing Backup, Restore etc tools
2018-03-15 16:15 [pgAdmin4][RM#3195] Include service name when executing Backup, Restore etc tools Murtuza Zabuawala <[email protected]>
2018-03-15 20:55 ` Re: [pgAdmin4][RM#3195] Include service name when executing Backup, Restore etc tools Victoria Henry <[email protected]>
@ 2018-03-16 03:49 ` Murtuza Zabuawala <[email protected]>
0 siblings, 0 replies; 4+ messages in thread
From: Murtuza Zabuawala @ 2018-03-16 03:49 UTC (permalink / raw)
To: Victoria Henry <[email protected]>; +Cc: pgadmin-hackers
Thanks Joao and Victoria for reviewing.
As Khushboo mentioned in her previous email we already have RM for the same(
https://redmine.postgresql.org/issues/3206), We will send separate patch.
--
Regards,
Murtuza Zabuawala
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
On Fri, Mar 16, 2018 at 2:25 AM, Victoria Henry <[email protected]> wrote:
> Hey Murtuza,
>
> This patch passed our test pipelines and it looks good.
> Do we have any tests around this behavior?
>
> Joao and Victoria
>
^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: [pgAdmin4][RM#3195] Include service name when executing Backup, Restore etc tools
2018-03-15 16:15 [pgAdmin4][RM#3195] Include service name when executing Backup, Restore etc tools Murtuza Zabuawala <[email protected]>
@ 2018-03-19 11:01 ` Dave Page <[email protected]>
1 sibling, 0 replies; 4+ messages in thread
From: Dave Page @ 2018-03-19 11:01 UTC (permalink / raw)
To: Murtuza Zabuawala <[email protected]>; +Cc: pgadmin-hackers
Thanks, applied.
On Thu, Mar 15, 2018 at 4:15 PM, Murtuza Zabuawala <
[email protected]> wrote:
> 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
>
>
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
^ permalink raw reply [nested|flat] 4+ messages in thread
end of thread, other threads:[~2018-03-19 11:01 UTC | newest]
Thread overview: 4+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2018-03-15 16:15 [pgAdmin4][RM#3195] Include service name when executing Backup, Restore etc tools Murtuza Zabuawala <[email protected]>
2018-03-15 20:55 ` Victoria Henry <[email protected]>
2018-03-16 03:49 ` Murtuza Zabuawala <[email protected]>
2018-03-19 11:01 ` Dave Page <[email protected]>
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox