From a31d66f82615aa128630bc10d3391c5675d853b6 Mon Sep 17 00:00:00 2001 From: Ian Barwick Date: Wed, 5 Jul 2017 11:36:30 +0900 Subject: [PATCH] repmgr standby follow: add event details Useful to have a confirmation of which node was followed. --- repmgr-action-standby.c | 21 +++++++++++++++------ repmgrd.c | 2 +- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/repmgr-action-standby.c b/repmgr-action-standby.c index d4764e6f..3e960bb3 100644 --- a/repmgr-action-standby.c +++ b/repmgr-action-standby.c @@ -1257,6 +1257,7 @@ do_standby_follow(void) char restart_command[MAXLEN]; int r; + PQExpBufferData event_details; log_verbose(LOG_DEBUG, "do_standby_follow()"); @@ -1350,7 +1351,6 @@ do_standby_follow(void) { int server_version_num = get_server_version(primary_conn, NULL); - PQExpBufferData event_details; initPQExpBuffer(&event_details); if (create_replication_slot(primary_conn, repmgr_slot_name, server_version_num, &event_details) == false) @@ -1543,12 +1543,21 @@ do_standby_follow(void) log_notice(_("STANDBY FOLLOW successful")); + initPQExpBuffer(&event_details); + appendPQExpBuffer(&event_details, + _("node %i is now attached to node %i"), + config_file_options.node_id, primary_id); + create_event_notification(primary_conn, - &config_file_options, - config_file_options.node_id, - "standby_follow", - true, - NULL); + &config_file_options, + config_file_options.node_id, + "standby_follow", + true, + event_details.data); + + log_detail("%s", event_details.data); + + termPQExpBuffer(&event_details); PQfinish(primary_conn); diff --git a/repmgrd.c b/repmgrd.c index 5d822404..73c609c6 100644 --- a/repmgrd.c +++ b/repmgrd.c @@ -721,7 +721,7 @@ monitor_streaming_standby(void) upstream_node_status = NODE_STATUS_UNKNOWN; appendPQExpBuffer(&event_details, - _("unable to connect to upstream node %s (node ID: %i)"), + _("unable to connect to upstream node \"%s\" (node ID: %i)"), upstream_node_info.node_name, upstream_node_info.node_id); if (upstream_node_info.type == STANDBY)