db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-07-17 07:22:20 +02:00
Code Issues Releases Activity

minor fixes and changes to elog messages

Browse Source
This commit is contained in:
Grigory Smolkin
2018-03-26 19:50:49 +03:00
parent e82ae6d144
commit c90210910b
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backup.c
View File

@ -775,10 +775,10 @@ do_backup(time_t start_time)
is_checksum_enabled = pg_checksum_enable(); is_checksum_enabled = pg_checksum_enable();
if (is_checksum_enabled) if (is_checksum_enabled)
elog(LOG, "This PostgreSQL instance initialized with data block checksums. " elog(LOG, "This PostgreSQL instance was initialized with data block checksums. "
"Data block corruption will be detected"); "Data block corruption will be detected");
else else
elog(WARNING, "This PostgreSQL instance initialized without data block checksums. " elog(WARNING, "This PostgreSQL instance was initialized without data block checksums. "
"pg_probackup have no way to detect data block corruption without them. " "pg_probackup have no way to detect data block corruption without them. "
"Reinitialize PGDATA with option '--data-checksums'."); "Reinitialize PGDATA with option '--data-checksums'.");
@ -1870,7 +1870,7 @@ backup_cleanup(bool fatal, void *userdata)
*/ */
if (current.status == BACKUP_STATUS_RUNNING && current.end_time == 0) if (current.status == BACKUP_STATUS_RUNNING && current.end_time == 0)
{ {
elog(INFO, "Backup %s is running, setting its status to ERROR", elog(WARNING, "Backup %s is running, setting its status to ERROR",
base36enc(current.start_time)); base36enc(current.start_time));
current.end_time = time(NULL); current.end_time = time(NULL);
current.status = BACKUP_STATUS_ERROR; current.status = BACKUP_STATUS_ERROR;
@ -1882,7 +1882,7 @@ backup_cleanup(bool fatal, void *userdata)
*/ */
if (backup_in_progress) if (backup_in_progress)
{ {
elog(LOG, "backup in progress, stop backup"); elog(WARNING, "backup in progress, stop backup");
pg_stop_backup(NULL); /* don't care stop_lsn on error case */ pg_stop_backup(NULL); /* don't care stop_lsn on error case */
} }
} }
@ -2560,7 +2560,7 @@ stop_streaming(XLogRecPtr xlogpos, uint32 timeline, bool segment_finished)
/* we assume that we get called once at the end of each segment */ /* we assume that we get called once at the end of each segment */
if (segment_finished) if (segment_finished)
elog(LOG, _("finished segment at %X/%X (timeline %u)\n"), elog(LOG, _("finished streaming WAL at %X/%X (timeline %u)"),
(uint32) (xlogpos >> 32), (uint32) xlogpos, timeline); (uint32) (xlogpos >> 32), (uint32) xlogpos, timeline);
/* /*
@ -2664,7 +2664,7 @@ StreamLog(void *arg)
/* /*
* Start the replication * Start the replication
*/ */
elog(LOG, _("starting log streaming at %X/%X (timeline %u)\n"), elog(LOG, _("started streaming WAL at %X/%X (timeline %u)"),
(uint32) (startpos >> 32), (uint32) startpos, starttli); (uint32) (startpos >> 32), (uint32) startpos, starttli);
#if PG_VERSION_NUM >= 90600 #if PG_VERSION_NUM >= 90600

12
src/utils/pgut.c
View File

@ -1526,7 +1526,7 @@ pgut_execute_parallel(PGconn* conn,
elog(ERROR, "interrupted"); elog(ERROR, "interrupted");
/* write query to elog if verbose */ /* write query to elog if verbose */
if (LOG_LEVEL_CONSOLE <= LOG || LOG_LEVEL_FILE <= LOG) if (LOG_LEVEL_CONSOLE <= VERBOSE || LOG_LEVEL_FILE <= VERBOSE)
{ {
int i; int i;
@ -1580,7 +1580,7 @@ pgut_execute(PGconn* conn, const char *query, int nParams, const char **params,
elog(ERROR, "interrupted"); elog(ERROR, "interrupted");
/* write query to elog if verbose */ /* write query to elog if verbose */
if (LOG_LEVEL_CONSOLE <= LOG || LOG_LEVEL_FILE <= LOG) if (LOG_LEVEL_CONSOLE <= VERBOSE || LOG_LEVEL_FILE <= VERBOSE)
{ {
int i; int i;
@ -1634,16 +1634,16 @@ pgut_send(PGconn* conn, const char *query, int nParams, const char **params, int
elog(ERROR, "interrupted"); elog(ERROR, "interrupted");
/* write query to elog if verbose */ /* write query to elog if verbose */
if (LOG_LEVEL_CONSOLE <= LOG) if (LOG_LEVEL_CONSOLE <= VERBOSE || LOG_LEVEL_FILE <= VERBOSE)
{ {
int i; int i;
if (strchr(query, '\n')) if (strchr(query, '\n'))
elog(LOG, "(query)\n%s", query); elog(VERBOSE, "(query)\n%s", query);
else else
elog(LOG, "(query) %s", query); elog(VERBOSE, "(query) %s", query);
for (i = 0; i < nParams; i++) for (i = 0; i < nParams; i++)
elog(LOG, "\t(param:%d) = %s", i, params[i] ? params[i] : "(null)"); elog(VERBOSE, "\t(param:%d) = %s", i, params[i] ? params[i] : "(null)");
} }
if (conn == NULL) if (conn == NULL)