Commitad8fbb5

committed

Cleanup items from csvlog changes, per ITAGAKI Takahiro.

1 parentbab16af commitad8fbb5Copy full SHA for ad8fbb5

File tree

+11

-3

lines changed

src/backend
- postmaster
  - syslogger.c
- utils/misc
  - postgresql.conf.sample

+11

-3

lines changed

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*`
`19`	`19`	`*`
`20`	`20`	`* IDENTIFICATION`
`21`		`- * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.38 2007/08/21 01:47:19 tgl Exp $`
	`21`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.39 2007/09/20 18:19:08 adunstan Exp $`
`22`	`22`	`*`
`23`	`23`	`*-------------------------------------------------------------------------`
`24`	`24`	`*/`
`@@ -352,7 +352,15 @@ SysLoggerMain(int argc, char *argv[])`
`352`	`352`	`}`
`353`	`353`
`354`	`354`	`if (rotation_requested)`
	`355`	`+{`
	`356`	`+/*`
	`357`	`+ * Force rotation when both values are zero.`
	`358`	`+ * It means the request was sent by pg_rotate_logfile.`
	`359`	`+ */`
	`360`	`+if (!time_based_rotation&&size_rotation_for==0)`
	`361`	`+size_rotation_for=LOG_DESTINATION_STDERR \|LOG_DESTINATION_CSVLOG;`
`355`	`362`	`logfile_rotate(time_based_rotation,size_rotation_for);`
	`363`	`+}`
`356`	`364`
`357`	`365`	`#ifndefWIN32`
`358`	`366`
`@@ -1154,7 +1162,7 @@ logfile_rotate(bool time_based_rotation, int size_rotation_for)`
`1154`	`1162`	`EnterCriticalSection(&sysfileSection);`
`1155`	`1163`	`#endif`
`1156`	`1164`	`fclose(csvlogFile);`
`1157`		`-syslogFile=fh;`
	`1165`	`+csvlogFile=fh;`
`1158`	`1166`	`#ifdefWIN32`
`1159`	`1167`	`LeaveCriticalSection(&sysfileSection);`
`1160`	`1168`	`#endif`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,7 @@`
`312`	`312`
`313`	`313`
`314`	`314`	`#silent_mode = off# DO NOT USE without syslog or`
`315`		`-#redirect_stderr`
	`315`	`+#logging_collector`
`316`	`316`	`# (change requires restart)`
`317`	`317`
`318`	`318`	`# - What to Log -`

Comments

(0)