diff --git a/configfile.c b/configfile.c index af63cffa..387eb4d3 100644 --- a/configfile.c +++ b/configfile.c @@ -932,7 +932,7 @@ reload_config(t_configuration_options *orig_options) if (config_errors.head != NULL) { /* XXX dump errors to log */ - log_warning(_("unable to parse new configuration, retaining current configuration\n")); + log_warning(_("unable to parse new configuration, retaining current configuration")); return false; } @@ -946,7 +946,7 @@ reload_config(t_configuration_options *orig_options) if (strcmp(new_options.node_name, orig_options->node_name) != 0) { - log_warning(_("\"node_name\" cannot be changed, keeping current configuration\n")); + log_warning(_("\"node_name\" cannot be changed, keeping current configuration")); return false; } diff --git a/repmgr-action-bdr.c b/repmgr-action-bdr.c index 78e4fa4e..6c828a66 100644 --- a/repmgr-action-bdr.c +++ b/repmgr-action-bdr.c @@ -129,7 +129,7 @@ do_bdr_register(void) if (node_exists == false) { log_error(_("no BDR node with node_name \"%s\" found"), config_file_options.node_name); - log_hint(_("\"node_name\" in repmgr.conf must match \"node_name\" in bdr.bdr_nodes\n")); + log_hint(_("\"node_name\" in repmgr.conf must match \"node_name\" in bdr.bdr_nodes")); PQfinish(conn); exit(ERR_BAD_CONFIG); } @@ -272,8 +272,9 @@ do_bdr_register(void) { appendPQExpBuffer(&event_details, _("node record updated for node '%s' (%i)"), config_file_options.node_name, config_file_options.node_id); - log_verbose(LOG_NOTICE, "%s\n", event_details.data); + log_verbose(LOG_NOTICE, "%s", event_details.data); } + else { success = false; } diff --git a/repmgr-action-cluster.c b/repmgr-action-cluster.c index 053fcbca..f1688eaf 100644 --- a/repmgr-action-cluster.c +++ b/repmgr-action-cluster.c @@ -84,7 +84,7 @@ do_cluster_show(void) ItemList warnings = {NULL, NULL}; /* Connect to local database to obtain cluster connection data */ - log_verbose(LOG_INFO, _("connecting to database\n")); + log_verbose(LOG_INFO, _("connecting to database")); if (strlen(config_file_options.conninfo)) conn = establish_db_connection(config_file_options.conninfo, true); @@ -1052,7 +1052,7 @@ build_cluster_crosscheck(t_node_status_cube ***dest_cube, int *name_length) int node_count = 0; /* We need to connect to get the list of nodes */ - log_info(_("connecting to database\n")); + log_info(_("connecting to database")); if (strlen(config_file_options.conninfo)) conn = establish_db_connection(config_file_options.conninfo, true); @@ -1327,7 +1327,7 @@ do_cluster_cleanup(void) if (vacuum_table(primary_conn, "repmgr.monitoring_history") == false) { /* annoying if this fails, but not fatal */ - log_warning(_("unable to vacuum table repmgr.monitoring_history\n")); + log_warning(_("unable to vacuum table \"repmgr.monitoring_history\"")); log_detail("%s", PQerrorMessage(primary_conn)); } diff --git a/repmgr-action-standby.c b/repmgr-action-standby.c index ad1a7341..7ff5c93a 100644 --- a/repmgr-action-standby.c +++ b/repmgr-action-standby.c @@ -4039,7 +4039,7 @@ run_file_backup(t_node_info *node_record) make_barman_ssh_command(barman_command_buf), config_file_options.barman_server); - log_verbose(LOG_DEBUG, "executing:\n %s\n", command); + log_verbose(LOG_DEBUG, "executing:\n %s", command); fi = popen(command, "r"); if (fi == NULL)