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

Add a RecordStatus return type for functions which populate record structures

Browse Source 
Unify a bunch of slightly different ways of handling the result.
This commit is contained in:
Ian Barwick
2017-06-23 16:16:46 +09:00
parent 0823a83f92
commit dbaa2e0b44
5 changed files with 61 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
repmgrd.c
View File

@@ -61,6 +61,8 @@ main(int argc, char **argv)
char cli_loglevel[MAXLEN] = "";
bool cli_monitoring_history = false;
RecordStatus record_status;
static struct option long_options[] =
{
/* general options */
@@ -232,15 +234,18 @@ main(int argc, char **argv)
/*
* sanity checks
*
* Note: previous repmgr versions checked the PostgreSQL version at this point,
* but we'll skip that and assume the presence of a node record means we're
* dealing with a supported installation.
* Note: previous repmgr versions checked the PostgreSQL version at this
* point, but we'll skip that and assume the presence of a node record
* means we're dealing with a supported installation.
*
* The absence of a node record will also indicate that either the node
* or repmgr has note been properly configured.
*/
/* Retrieve record for this node from the local database */
(void) get_node_record(local_conn, config_file_options.node_id, &local_node_info);
record_status = get_node_record(local_conn, config_file_options.node_id, &local_node_info);
if (local_node_info.node_id == NODE_NOT_FOUND)
if (record_status != RECORD_FOUND)
{
log_error(_("no metadata record found for this node - terminating"));
log_hint(_("Check that 'repmgr (master|standby) register' was executed for this node"));