diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2007-09-20 18:19:08 +0000 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2007-09-20 18:19:08 +0000 |
| commit | ad8fbb549a91db1f9a9dafc990573f5bcbfcfe40 (patch) | |
| tree | b913e505a626a4d38366d9fceb707ea6c4c143e8 /src | |
| parent | bab16af807c959f5aee476b551bca89cd58cd36e (diff) | |
| download | postgresql-ad8fbb549a91db1f9a9dafc990573f5bcbfcfe40.tar.gz postgresql-ad8fbb549a91db1f9a9dafc990573f5bcbfcfe40.zip | |
Cleanup items from csvlog changes, per ITAGAKI Takahiro.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/postmaster/syslogger.c | 12 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c index fc44c4398df..001e206a96c 100644 --- a/src/backend/postmaster/syslogger.c +++ b/src/backend/postmaster/syslogger.c @@ -18,7 +18,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.38 2007/08/21 01:47:19 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.39 2007/09/20 18:19:08 adunstan Exp $ * *------------------------------------------------------------------------- */ @@ -352,7 +352,15 @@ SysLoggerMain(int argc, char *argv[]) } if (rotation_requested) + { + /* + * Force rotation when both values are zero. + * It means the request was sent by pg_rotate_logfile. + */ + if (!time_based_rotation && size_rotation_for == 0) + size_rotation_for = LOG_DESTINATION_STDERR | LOG_DESTINATION_CSVLOG; logfile_rotate(time_based_rotation, size_rotation_for); + } #ifndef WIN32 @@ -1154,7 +1162,7 @@ logfile_rotate(bool time_based_rotation, int size_rotation_for) EnterCriticalSection(&sysfileSection); #endif fclose(csvlogFile); - syslogFile = fh; + csvlogFile = fh; #ifdef WIN32 LeaveCriticalSection(&sysfileSection); #endif diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index 470f96ca96c..3816210d85a 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -312,7 +312,7 @@ #silent_mode = off # DO NOT USE without syslog or - # redirect_stderr + # logging_collector # (change requires restart) # - What to Log - |