diff options
| author | Pavan Deolasee | 2015-06-01 07:08:38 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2015-06-01 07:08:38 +0000 |
| commit | b73fd4e41b737f9a81bdf46640df2bf7f4d71bce (patch) | |
| tree | 29f23eb54bef7153502ce4437d310456b43de446 | |
| parent | ae985ca2ff33bcd6bfb9407d42dced66c489c023 (diff) | |
Add missing support for handling extra configuration file for GTM proxies in
pgxc_ctl
| -rw-r--r-- | contrib/pgxc_ctl/gtm_cmd.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/contrib/pgxc_ctl/gtm_cmd.c b/contrib/pgxc_ctl/gtm_cmd.c index 6aec250627..0737549d47 100644 --- a/contrib/pgxc_ctl/gtm_cmd.c +++ b/contrib/pgxc_ctl/gtm_cmd.c @@ -894,6 +894,7 @@ cmd_t *prepare_initGtmProxy(char *nodeName) int idx; FILE *f; char timestamp[MAXTOKEN+1]; + char **fileList = NULL; if ((idx = gtmProxyIdx(nodeName)) < 0) { @@ -924,15 +925,24 @@ cmd_t *prepare_initGtmProxy(char *nodeName) "#===========================\n" "# Added at initialization, %s\n" "nodename = '%s'\n" - "listen_addresses = '*'\n" + "listen_addresses = '*'\n", + 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" "gtm_port = %s\n" "worker_threads = 1\n" "gtm_connect_retry_interval = 1\n" "# End of addition\n", - timeStampString(timestamp, MAXTOKEN), - aval(VAR_gtmProxyNames)[idx], aval(VAR_gtmProxyPorts)[idx], sval(VAR_gtmMasterServer), sval(VAR_gtmMasterPort)); |