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

Always quote node names in log messages

Browse Source
This commit is contained in:
Ian Barwick
2019-04-30 15:52:56 +09:00
parent d7de0a64e0
commit 89a7261483
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbutils.c
View File

@@ -2490,7 +2490,7 @@ get_node_record_by_name(PGconn *conn, const char *node_name, t_node_info *node_i
if (record_status == RECORD_NOT_FOUND) if (record_status == RECORD_NOT_FOUND)
{ {
log_verbose(LOG_DEBUG, "get_node_record_by_name(): no record found for node %s", log_verbose(LOG_DEBUG, "get_node_record_by_name(): no record found for node \"%s\"",
node_name); node_name);
} }

26
repmgr-action-primary.c
View File

@@ -274,7 +274,7 @@ do_primary_unregister(void)
if (get_primary_node_record(local_conn, &primary_node_info) == true) if (get_primary_node_record(local_conn, &primary_node_info) == true)
{ {
log_detail(_("current primary registered as node %s (id: %i, conninfo: \"%s\")"), log_detail(_("current primary registered as node \"%s\" (ID: %i, conninfo: \"%s\")"),
primary_node_info.node_name, primary_node_info.node_name,
primary_node_info.node_id, primary_node_info.node_id,
primary_node_info.conninfo); primary_node_info.conninfo);
@@ -316,7 +316,7 @@ do_primary_unregister(void)
if (target_node_info_ptr->type == WITNESS) if (target_node_info_ptr->type == WITNESS)
{ {
log_error(_("node %s (id: %i) is a witness server, unable to unregister"), log_error(_("node \"%s\" (ID: %i) is a witness server, unable to unregister"),
target_node_info_ptr->node_name, target_node_info_ptr->node_name,
target_node_info_ptr->node_id); target_node_info_ptr->node_id);
if (target_node_info_ptr->type == STANDBY) if (target_node_info_ptr->type == STANDBY)
@@ -377,7 +377,7 @@ do_primary_unregister(void)
{ {
if (target_node_info_ptr->type != PRIMARY) if (target_node_info_ptr->type != PRIMARY)
{ {
log_error(_("node %s (id: %i) is not a primary, unable to unregister"), log_error(_("node \"%s\" (ID: %i) is not a primary, unable to unregister"),
target_node_info_ptr->node_name, target_node_info_ptr->node_name,
target_node_info_ptr->node_id); target_node_info_ptr->node_id);
if (target_node_info_ptr->type == STANDBY) if (target_node_info_ptr->type == STANDBY)
@@ -404,7 +404,7 @@ do_primary_unregister(void)
*/ */
if (target_node_info_ptr->type != PRIMARY) if (target_node_info_ptr->type != PRIMARY)
{ {
log_error(_("node %s (ID: %i) is a %s, unable to unregister"), log_error(_("node \"%s\" (ID: %i) is a %s, unable to unregister"),
target_node_info_ptr->node_name, target_node_info_ptr->node_name,
target_node_info_ptr->node_id, target_node_info_ptr->node_id,
get_node_type_string(target_node_info_ptr->type)); get_node_type_string(target_node_info_ptr->type));
@@ -418,7 +418,7 @@ do_primary_unregister(void)
*/ */
else if (!runtime_options.force) else if (!runtime_options.force)
{ {
log_error(_("node %s (ID: %i) is running as a standby, unable to unregister"), log_error(_("node \"%s\" (ID: %i) is running as a standby, unable to unregister"),
target_node_info_ptr->node_name, target_node_info_ptr->node_name,
target_node_info_ptr->node_id); target_node_info_ptr->node_id);
log_hint(_("the node can be registered as a standby with \"repmgr standby register --force\"")); log_hint(_("the node can be registered as a standby with \"repmgr standby register --force\""));
@@ -443,7 +443,7 @@ do_primary_unregister(void)
if (primary_record_found == false) if (primary_record_found == false)
{ {
log_error(_("node %s (ID: %i) is a primary node, but no primary node record found"), log_error(_("node \"%s\" (ID: %i) is a primary node, but no primary node record found"),
target_node_info_ptr->node_name, target_node_info_ptr->node_name,
target_node_info_ptr->node_id); target_node_info_ptr->node_id);
log_hint(_("register this node as primary with \"repmgr primary register --force\"")); log_hint(_("register this node as primary with \"repmgr primary register --force\""));
@@ -458,7 +458,7 @@ do_primary_unregister(void)
*/ */
if (primary_node_info.node_id == target_node_info_ptr->node_id) if (primary_node_info.node_id == target_node_info_ptr->node_id)
{ {
log_error(_("node %s (ID: %i) is the current primary node, unable to unregister"), log_error(_("node \"%s\" (ID: %i) is the current primary node, unable to unregister"),
target_node_info_ptr->node_name, target_node_info_ptr->node_name,
target_node_info_ptr->node_id); target_node_info_ptr->node_id);
@@ -480,7 +480,7 @@ do_primary_unregister(void)
{ {
if (!runtime_options.force) if (!runtime_options.force)
{ {
log_error(_("node %s (ID: %i) is marked as active, unable to unregister"), log_error(_("node \"%s\" (ID: %i) is marked as active, unable to unregister"),
target_node_info_ptr->node_name, target_node_info_ptr->node_name,
target_node_info_ptr->node_id); target_node_info_ptr->node_id);
log_hint(_("run \"repmgr primary unregister --force\" to unregister this node")); log_hint(_("run \"repmgr primary unregister --force\" to unregister this node"));
@@ -491,7 +491,7 @@ do_primary_unregister(void)
if (runtime_options.dry_run == true) if (runtime_options.dry_run == true)
{ {
log_notice(_("node %s (ID: %i) would now be unregistered"), log_notice(_("node \"%s\" (ID: %i) would now be unregistered"),
target_node_info_ptr->node_name, target_node_info_ptr->node_name,
target_node_info_ptr->node_id); target_node_info_ptr->node_id);
log_hint(_("run the same command without the --dry-run option to unregister this node")); log_hint(_("run the same command without the --dry-run option to unregister this node"));
@@ -504,7 +504,7 @@ do_primary_unregister(void)
if (delete_success == false) if (delete_success == false)
{ {
log_error(_("unable to unregister node %s (ID: %i)"), log_error(_("unable to unregister node \"%s\" (ID: %i)"),
target_node_info_ptr->node_name, target_node_info_ptr->node_name,
target_node_info_ptr->node_id); target_node_info_ptr->node_id);
PQfinish(primary_conn); PQfinish(primary_conn);
@@ -513,14 +513,14 @@ do_primary_unregister(void)
initPQExpBuffer(&event_details); initPQExpBuffer(&event_details);
appendPQExpBuffer(&event_details, appendPQExpBuffer(&event_details,
_("node %s (ID: %i) unregistered"), _("node \"%s\" (ID: %i) unregistered"),
target_node_info_ptr->node_name, target_node_info_ptr->node_name,
target_node_info_ptr->node_id); target_node_info_ptr->node_id);
if (target_node_info_ptr->node_id != config_file_options.node_id) if (target_node_info_ptr->node_id != config_file_options.node_id)
{ {
appendPQExpBuffer(&event_details, appendPQExpBuffer(&event_details,
_(" from node %s (ID: %i)"), _(" from node \"%s\" (ID: %i)"),
config_file_options.node_name, config_file_options.node_name,
config_file_options.node_id); config_file_options.node_id);
} }
@@ -533,7 +533,7 @@ do_primary_unregister(void)
event_details.data); event_details.data);
termPQExpBuffer(&event_details); termPQExpBuffer(&event_details);
log_info(_("node %s (ID: %i) was successfully unregistered"), log_info(_("node \"%s\" (ID: %i) was successfully unregistered"),
target_node_info_ptr->node_name, target_node_info_ptr->node_name,
target_node_info_ptr->node_id); target_node_info_ptr->node_id);
} }

12
repmgr-action-standby.c
View File

@@ -4178,7 +4178,7 @@ do_standby_switchover(void)
*/ */
if (repmgrd_info[i]->pg_running == false) if (repmgrd_info[i]->pg_running == false)
{ {
log_warning(_("node %s (ID %i) unreachable, unable to pause repmgrd"), log_warning(_("node \"%s\" (ID %i) unreachable, unable to pause repmgrd"),
cell->node_info->node_name, cell->node_info->node_name,
cell->node_info->node_id); cell->node_info->node_id);
i++; i++;
@@ -4191,7 +4191,7 @@ do_standby_switchover(void)
*/ */
if (repmgrd_info[i]->running == false) if (repmgrd_info[i]->running == false)
{ {
log_warning(_("repmgrd not running on node %s (ID %i)"), log_warning(_("repmgrd not running on node \"%s\" (ID %i)"),
cell->node_info->node_name, cell->node_info->node_name,
cell->node_info->node_id); cell->node_info->node_id);
i++; i++;
@@ -4212,14 +4212,14 @@ do_standby_switchover(void)
if (runtime_options.dry_run == true) if (runtime_options.dry_run == true)
{ {
log_info(_("would pause repmgrd on node %s (ID %i)"), log_info(_("would pause repmgrd on node \"%s\" (ID %i)"),
cell->node_info->node_name, cell->node_info->node_name,
cell->node_info->node_id); cell->node_info->node_id);
} }
else else
{ {
/* XXX check result */ /* XXX check result */
log_debug("pausing repmgrd on node %s (ID %i)", log_debug("pausing repmgrd on node \"%s\" (ID %i)",
cell->node_info->node_name, cell->node_info->node_name,
cell->node_info->node_id); cell->node_info->node_id);
@@ -4821,7 +4821,7 @@ do_standby_switchover(void)
if (repmgrd_info[i]->paused == true) if (repmgrd_info[i]->paused == true)
{ {
log_debug("repmgrd on node %s (ID %i) paused before switchover, not unpausing", log_debug("repmgrd on node \"%s\" (ID %i) paused before switchover, not unpausing",
cell->node_info->node_name, cell->node_info->node_name,
cell->node_info->node_id); cell->node_info->node_id);
@@ -4829,7 +4829,7 @@ do_standby_switchover(void)
continue; continue;
} }
log_debug("unpausing repmgrd on node %s (ID %i)", log_debug("unpausing repmgrd on node \"%s\" (ID %i)",
cell->node_info->node_name, cell->node_info->node_name,
cell->node_info->node_id); cell->node_info->node_id);

2
repmgr-client.c
View File

@@ -1290,7 +1290,7 @@ main(int argc, char **argv)
pfree(escaped); pfree(escaped);
if (record_status != RECORD_FOUND) if (record_status != RECORD_FOUND)
{ {
log_error(_("node %s (specified with --node-name) not found"), log_error(_("node \"%s\" (specified with --node-name) not found"),
runtime_options.node_name); runtime_options.node_name);
PQfinish(conn); PQfinish(conn);
free_conninfo_params(&source_conninfo); free_conninfo_params(&source_conninfo);

6
repmgrd-bdr.c
View File

@@ -128,7 +128,7 @@ monitor_bdr(void)
if (record_status != RECORD_FOUND) if (record_status != RECORD_FOUND)
{ {
log_error(_("unable to retrieve BDR record for node %s, terminating"), log_error(_("unable to retrieve BDR record for node \"%s\", terminating"),
local_node_info.node_name); local_node_info.node_name);
PQfinish(local_conn); PQfinish(local_conn);
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
@@ -231,7 +231,7 @@ monitor_bdr(void)
cell->node_info->conn = NULL; cell->node_info->conn = NULL;
} }
log_warning(_("unable to connect to node %s (ID %i)"), log_warning(_("unable to connect to node \"%s\" (ID %i)"),
cell->node_info->node_name, cell->node_info->node_id); cell->node_info->node_name, cell->node_info->node_id);
//cell->node_info->conn = try_reconnect(cell->node_info); //cell->node_info->conn = try_reconnect(cell->node_info);
try_reconnect(&cell->node_info->conn, cell->node_info); try_reconnect(&cell->node_info->conn, cell->node_info);
@@ -586,7 +586,7 @@ do_bdr_recovery(NodeInfoList *nodes, t_node_info *monitored_node)
get_bdr_other_node_name(local_conn, local_node_info.node_id, node_name); get_bdr_other_node_name(local_conn, local_node_info.node_id, node_name);
log_info(_("detected recovery on node %s (ID: %i), checking status"), log_info(_("detected recovery on node \"%s\" (ID: %i), checking status"),
monitored_node->node_name, monitored_node->node_name,
monitored_node->node_id); monitored_node->node_id);