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

fix: do not newline at the start of a log line

Browse Source 
This breaks the log file format since it will have a line break directly
after the timestamp
This commit is contained in:
Christian Kruse
2014-01-22 11:47:02 +01:00
parent 4ef6fbb5fe
commit d235c696af
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
repmgr.c
View File

@@ -1375,7 +1375,7 @@ do_standby_promote(void)
} }
else else
{ {
log_err(_("\n%s: STANDBY PROMOTE successful. You should REINDEX any hash indexes you have.\n"), progname); log_err(_("%s: STANDBY PROMOTE successful. You should REINDEX any hash indexes you have.\n"), progname);
} }
PQfinish(conn); PQfinish(conn);
return; return;
@@ -1420,7 +1420,7 @@ do_standby_follow(void)
if (ret == NULL || strcmp(standby_version, "") == 0) if (ret == NULL || strcmp(standby_version, "") == 0)
{ {
if (ret != NULL) if (ret != NULL)
log_err(_("\n%s needs standby to be PostgreSQL 9.0 or better\n"), progname); log_err(_("%s needs standby to be PostgreSQL 9.0 or better\n"), progname);
PQfinish(conn); PQfinish(conn);
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
@@ -1493,7 +1493,7 @@ do_standby_follow(void)
strncpy(runtime_options.masterport, PQport(master_conn), MAXLEN); strncpy(runtime_options.masterport, PQport(master_conn), MAXLEN);
PQfinish(master_conn); PQfinish(master_conn);
log_info(_("%s Changing standby's master"),progname); log_info(_("%s Changing standby's master\n"),progname);
/* Get the data directory full path */ /* Get the data directory full path */
sqlquery_snprintf(sqlquery, "SELECT setting " sqlquery_snprintf(sqlquery, "SELECT setting "
@@ -1628,7 +1628,7 @@ do_witness_create(void)
pg_conf = fopen(buf, "a"); pg_conf = fopen(buf, "a");
if (pg_conf == NULL) if (pg_conf == NULL)
{ {
log_err(_("\n%s: could not open \"%s\" for adding extra config: %s\n"), progname, buf, strerror(errno)); log_err(_("%s: could not open \"%s\" for adding extra config: %s\n"), progname, buf, strerror(errno));
PQfinish(masterconn); PQfinish(masterconn);
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
@@ -1735,8 +1735,8 @@ do_witness_create(void)
static void static void
usage(void) usage(void)
{ {
log_err(_("\n\n%s: Replicator manager \n"), progname); fprintf(stderr, _("\n\n%s: Replicator manager \n"), progname);
log_err(_("Try \"%s --help\" for more information.\n"), progname); fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
} }
@@ -1912,7 +1912,7 @@ copy_remote_files(char *host, char *remote_user, char *remote_path,
log_info(_("rsync partial transfer warning ignored\n")); log_info(_("rsync partial transfer warning ignored\n"));
} }
else else
log_warning( _("\nrsync completed with return code 24: " log_warning( _("rsync completed with return code 24: "
"\"Partial transfer due to vanished source files\".\n" "\"Partial transfer due to vanished source files\".\n"
"This can happen because of normal operation " "This can happen because of normal operation "
"on the master server, but it may indicate an " "on the master server, but it may indicate an "