NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitb0ec61c

committed

Quote filenames in error messages

The majority of all filenames are quoted in user facing error andlog messages, but a few were still printed without quotes. Whilethese filenames do not risk causing any ambiguity as their formatis strict, quote them anyways to be consistent across all logs.Also concatenate a message to keep it one line to make it easierto grep for in the code.Reviewed-by: Peter Eisentraut <peter@eisentraut.org>Reviewed-by: Michael Paquier <michael@paquier.xyz>Discussion:https://postgr.es/m/080EEABE-6645-4A46-AB20-6285ADAC44FE@yesql.se

1 parentbe6f7cd commitb0ec61cCopy full SHA for b0ec61c

File tree

2 files changed

-4

lines changed

src
- backend/access/transam
  - xlog.c
- bin/pg_waldump
  - pg_waldump.c

2 files changed

-4

lines changed

`‎src/backend/access/transam/xlog.c`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2248,8 +2248,7 @@ XLogWrite(XLogwrtRqst WriteRqst, TimeLineID tli, bool flexible)`
`2248`	`2248`	`errno=save_errno;`
`2249`	`2249`	`ereport(PANIC,`
`2250`	`2250`	`(errcode_for_file_access(),`
`2251`		`-errmsg("could not write to log file %s "`
`2252`		`-"at offset %u, length %zu: %m",`
	`2251`	`+errmsg("could not write to log file \"%s\" at offset %u, length %zu: %m",`
`2253`	`2252`	`xlogfname,startoffset,nleft)));`
`2254`	`2253`	`}`
`2255`	`2254`	`nleft-=written;`

`‎src/bin/pg_waldump/pg_waldump.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -418,11 +418,11 @@ WALDumpReadPage(XLogReaderState *state, XLogRecPtr targetPagePtr, int reqLen,`
`418`	`418`	`if (errinfo.wre_errno!=0)`
`419`	`419`	`{`
`420`	`420`	`errno=errinfo.wre_errno;`
`421`		`-pg_fatal("could not read from file%s, offset %d: %m",`
	`421`	`+pg_fatal("could not read from file\"%s\", offset %d: %m",`
`422`	`422`	`fname,errinfo.wre_off);`
`423`	`423`	`}`
`424`	`424`	`else`
`425`		`-pg_fatal("could not read from file%s, offset %d: read %d of %d",`
	`425`	`+pg_fatal("could not read from file\"%s\", offset %d: read %d of %d",`
`426`	`426`	`fname,errinfo.wre_off,errinfo.wre_read,`
`427`	`427`	`errinfo.wre_req);`
`428`	`428`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb0ec61c

File tree

2 files changed

2 files changed

`‎src/backend/access/transam/xlog.c`

`‎src/bin/pg_waldump/pg_waldump.c`

0 commit comments