diff options
| author | Peter Eisentraut | 2016-02-27 03:34:30 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2016-03-17 03:21:44 +0000 |
| commit | f4c454e9ba5262c5614c7637983c83b8c327e231 (patch) | |
| tree | c541c87bb901e244abf066ec821132a44725cdcb /src | |
| parent | 47211af17a2dbee38b53b2ea6de81499dbb2c7f5 (diff) | |
Add syslog_sequence_numbers parameter
Reviewed-by: Andreas Karlsson <andreas@proxel.se>
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/error/elog.c | 12 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 10 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 1 | ||||
| -rw-r--r-- | src/include/utils/elog.h | 1 |
4 files changed, 22 insertions, 2 deletions
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 5b7554b6ea1..88421c72a2a 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -106,6 +106,7 @@ int Log_error_verbosity = PGERROR_VERBOSE; char *Log_line_prefix = NULL; /* format for extra log line info */ int Log_destination = LOG_DESTINATION_STDERR; char *Log_destination_string = NULL; +bool syslog_sequence_numbers = true; #ifdef HAVE_SYSLOG @@ -2018,7 +2019,11 @@ write_syslog(int level, const char *line) chunk_nr++; - syslog(level, "[%lu-%d] %s", seq, chunk_nr, buf); + if (syslog_sequence_numbers) + syslog(level, "[%lu-%d] %s", seq, chunk_nr, buf); + else + syslog(level, "[%d] %s", chunk_nr, buf); + line += buflen; len -= buflen; } @@ -2026,7 +2031,10 @@ write_syslog(int level, const char *line) else { /* message short enough */ - syslog(level, "[%lu] %s", seq, line); + if (syslog_sequence_numbers) + syslog(level, "[%lu] %s", seq, line); + else + syslog(level, "%s", line); } } #endif /* HAVE_SYSLOG */ diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index be9d5cacc07..eb2b487acfa 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -1632,6 +1632,16 @@ static struct config_bool ConfigureNamesBool[] = NULL, NULL, NULL }, + { + {"syslog_sequence_numbers", PGC_SIGHUP, LOGGING_WHERE, + gettext_noop("Add sequence number to syslog messags to avoid duplicate suppression."), + NULL + }, + &syslog_sequence_numbers, + true, + NULL, NULL, NULL + }, + /* End-of-list marker */ { {NULL, 0, 0, NULL, NULL}, NULL, false, NULL, NULL, NULL diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index a6bb33557cb..08fc668dff4 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -358,6 +358,7 @@ # These are relevant when logging to syslog: #syslog_facility = 'LOCAL0' #syslog_ident = 'postgres' +#syslog_sequence_numbers = on # This is only relevant when logging to eventlog (win32): #event_source = 'PostgreSQL' diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index 7d338dd1cea..e245b2ee5f8 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -397,6 +397,7 @@ extern int Log_error_verbosity; extern char *Log_line_prefix; extern int Log_destination; extern char *Log_destination_string; +extern bool syslog_sequence_numbers; /* Log destination bitmap */ #define LOG_DESTINATION_STDERR 1 |