From 2d91413caf033d67694001973ef35bf0dd81cbeb Mon Sep 17 00:00:00 2001 From: Ian Barwick Date: Tue, 30 May 2017 09:30:34 +0900 Subject: [PATCH] Various minor fixes and code comments --- dbutils.c | 2 +- repmgr-client.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dbutils.c b/dbutils.c index 428e6709..f06f17cd 100644 --- a/dbutils.c +++ b/dbutils.c @@ -1374,7 +1374,7 @@ update_node_record_set_master(PGconn *conn, int this_node_id) initPQExpBuffer(&query); appendPQExpBuffer(&query, - " UPDATE repmgr.repl_nodes " + " UPDATE repmgr.nodes " " SET active = FALSE " " WHERE type = 'master' " " AND active IS TRUE "); diff --git a/repmgr-client.c b/repmgr-client.c index d97afe81..208a8ec9 100644 --- a/repmgr-client.c +++ b/repmgr-client.c @@ -172,6 +172,10 @@ main(int argc, char **argv) } break; case 'V': + /* + * in contrast to repmgr3 and earlier, we only display the repmgr version + * as it's not specific to a particular PostgreSQL version + */ printf("%s %s\n", progname(), REPMGR_VERSION); exit(SUCCESS); @@ -553,13 +557,13 @@ main(int argc, char **argv) if (strcasecmp(repmgr_action, "REGISTER") == 0) action = MASTER_REGISTER; } - else if(strcasecmp(repmgr_node_type, "STANDBY") == 0) + else if (strcasecmp(repmgr_node_type, "STANDBY") == 0) { if (strcasecmp(repmgr_action, "CLONE") == 0) action = STANDBY_CLONE; - else if(strcasecmp(repmgr_action, "REGISTER") == 0) + else if (strcasecmp(repmgr_action, "REGISTER") == 0) action = STANDBY_REGISTER; - else if(strcasecmp(repmgr_action, "UNREGISTER") == 0) + else if (strcasecmp(repmgr_action, "UNREGISTER") == 0) action = STANDBY_UNREGISTER; else if (strcasecmp(repmgr_action, "PROMOTE") == 0) action = STANDBY_PROMOTE; @@ -573,7 +577,7 @@ main(int argc, char **argv) action = STANDBY_RESTORE_CONFIG; } - else if(strcasecmp(repmgr_node_type, "CLUSTER") == 0) + else if (strcasecmp(repmgr_node_type, "CLUSTER") == 0) { if (strcasecmp(repmgr_action, "EVENT") == 0) action = CLUSTER_EVENT;