From bd5a4ff0435c721de3e7eb9b9207d9e96d79baf4 Mon Sep 17 00:00:00 2001 From: Sehrope Sarkuni Date: Thu, 16 Sep 2021 14:43:31 -0400 Subject: [PATCH 1/3] Add constant for list of log destinations that use files --- src/backend/postmaster/syslogger.c | 5 ++--- src/include/utils/elog.h | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c index bca3883572..bc546af7ff 100644 --- a/src/backend/postmaster/syslogger.c +++ b/src/backend/postmaster/syslogger.c @@ -420,7 +420,7 @@ SysLoggerMain(int argc, char *argv[]) * was sent by pg_rotate_logfile() or "pg_ctl logrotate". */ if (!time_based_rotation && size_rotation_for == 0) - size_rotation_for = LOG_DESTINATION_STDERR | LOG_DESTINATION_CSVLOG; + size_rotation_for = LOG_DESTINATIONS_WITH_FILES; logfile_rotate(time_based_rotation, size_rotation_for); } @@ -1465,8 +1465,7 @@ update_metainfo_datafile(void) FILE *fh; mode_t oumask; - if (!(Log_destination & LOG_DESTINATION_STDERR) && - !(Log_destination & LOG_DESTINATION_CSVLOG)) + if (!(Log_destination & LOG_DESTINATIONS_WITH_FILES)) { if (unlink(LOG_METAINFO_DATAFILE) < 0 && errno != ENOENT) ereport(LOG, diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index f53607e12e..bea8b93da6 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -437,6 +437,9 @@ extern bool syslog_split_messages; #define LOG_DESTINATION_EVENTLOG 4 #define LOG_DESTINATION_CSVLOG 8 +/* Log destinations with file handles */ +#define LOG_DESTINATIONS_WITH_FILES (LOG_DESTINATION_CSVLOG | LOG_DESTINATION_STDERR) + /* Other exported functions */ extern void DebugFileOpen(void); extern char *unpack_sql_state(int sql_state); -- 2.17.1