diff options
| author | Pavan Deolasee | 2017-03-24 08:10:02 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2017-05-05 04:59:34 +0000 |
| commit | 1df9c3af5a50b281d68374b0b209624b9e952a40 (patch) | |
| tree | c9c56c68af5fb06058aeb5256d14a3f5c5ddcc1c | |
| parent | 1ae850a4651ed10ea6a24d0f2f43f4c760dba78d (diff) | |
Ensure that the config parameters specified in the gtmPxyExtraConfig file take
precendence over the defaults.
As reported quite a while back by Tobias Oberstein, this bug remained
unaddressed for too long. This commit should fix and ensure that the values
supplied via gtmPxyExtraConfig are honored correctly.
| -rw-r--r-- | contrib/pgxc_ctl/gtm_cmd.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/contrib/pgxc_ctl/gtm_cmd.c b/contrib/pgxc_ctl/gtm_cmd.c index a1617d8538..beb1e3e1ec 100644 --- a/contrib/pgxc_ctl/gtm_cmd.c +++ b/contrib/pgxc_ctl/gtm_cmd.c @@ -1090,13 +1090,6 @@ cmd_t *prepare_initGtmProxy(char *nodeName) timeStampString(timestamp, MAXTOKEN), aval(VAR_gtmProxyNames)[idx]); - if (!is_none(sval(VAR_gtmPxyExtraConfig))) - AddMember(fileList, sval(VAR_gtmPxyExtraConfig)); - if (!is_none(sval(VAR_gtmPxySpecificExtraConfig))) - AddMember(fileList, sval(VAR_gtmPxySpecificExtraConfig)); - appendFiles(f, fileList); - CleanArray(fileList); - fprintf(f, "port = %s\n" "gtm_host = '%s'\n" @@ -1107,6 +1100,14 @@ cmd_t *prepare_initGtmProxy(char *nodeName) aval(VAR_gtmProxyPorts)[idx], sval(VAR_gtmMasterServer), sval(VAR_gtmMasterPort)); + + if (!is_none(sval(VAR_gtmPxyExtraConfig))) + AddMember(fileList, sval(VAR_gtmPxyExtraConfig)); + if (!is_none(sval(VAR_gtmPxySpecificExtraConfig))) + AddMember(fileList, sval(VAR_gtmPxySpecificExtraConfig)); + appendFiles(f, fileList); + CleanArray(fileList); + fclose(f); snprintf(newCommand(cmdGtmProxyConf), MAXLINE, "cat >> %s/gtm_proxy.conf", aval(VAR_gtmProxyDirs)[idx]); |