github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-25 16:16:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Remove ssh_hostname support

Browse Source 
Currently repmgr assumes the SSH hostname will be the same as the
database hostname, and it's easy enough now to extract this
from the node's conninfo string.

We can consider re-adding this in the next release if required.
This commit is contained in:
Ian Barwick
2016-09-29 00:24:04 +09:00
parent 9b5b9acb82
commit 41ec45a4cc
8 changed files with 23 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
config.c
View File

@@ -217,7 +217,6 @@ parse_config(t_configuration_options *options)
memset(options->conninfo, 0, sizeof(options->conninfo));
memset(options->barman_server, 0, sizeof(options->barman_server));
memset(options->barman_config, 0, sizeof(options->barman_config));
memset(options->ssh_hostname, 0, sizeof(options->ssh_hostname));
options->failover = MANUAL_FAILOVER;
options->priority = DEFAULT_PRIORITY;
memset(options->node_name, 0, sizeof(options->node_name));
@@ -317,8 +316,6 @@ parse_config(t_configuration_options *options)
strncpy(options->barman_server, value, MAXLEN);
else if (strcmp(name, "barman_config") == 0)
strncpy(options->barman_config, value, MAXLEN);
else if (strcmp(name, "ssh_hostname") == 0)
strncpy(options->ssh_hostname, value, MAXLEN);
else if (strcmp(name, "rsync_options") == 0)
strncpy(options->rsync_options, value, QUERY_STR_LEN);
else if (strcmp(name, "ssh_options") == 0)
@@ -455,10 +452,6 @@ parse_config(t_configuration_options *options)
PQconninfoFree(conninfo_options);
}
/*
* TODO: Sanity check ssh_hostname
*/
if (config_errors.head != NULL)
{
exit_with_errors(&config_errors);
@@ -627,10 +620,6 @@ reload_config(t_configuration_options *orig_options)
PQfinish(conn);
}
/*
* TODO: Sanity check the new ssh_hostname
*/
/*
* No configuration problems detected - copy any changed values
*
@@ -659,13 +648,6 @@ reload_config(t_configuration_options *orig_options)
config_changed = true;
}
/* ssh_hostname */
if (strcmp(orig_options->ssh_hostname, new_options.ssh_hostname) != 0)
{
strcpy(orig_options->ssh_hostname, new_options.ssh_hostname);
config_changed = true;
}
/* node */
if (orig_options->node != new_options.node)
{