|
19 | 19 | * |
20 | 20 | * |
21 | 21 | * IDENTIFICATION |
22 | | - * $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.34 2007/12/1209:39:54 petere Exp $ |
| 22 | + * $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.35 2007/12/1216:53:14 tgl Exp $ |
23 | 23 | * |
24 | 24 | *------------------------------------------------------------------------- |
25 | 25 | */ |
@@ -489,29 +489,42 @@ pgarch_archiveXlog(char *xlog) |
489 | 489 | if (WIFEXITED(rc)) |
490 | 490 | { |
491 | 491 | ereport(lev, |
492 | | -(errmsg("archive command failed with exit code %d",WEXITSTATUS(rc)), |
493 | | -errdetail("The failed archive command was: %s",xlogarchcmd))); |
| 492 | +(errmsg("archive command failed with exit code %d", |
| 493 | +WEXITSTATUS(rc)), |
| 494 | +errdetail("The failed archive command was: %s", |
| 495 | +xlogarchcmd))); |
494 | 496 | } |
495 | 497 | elseif (WIFSIGNALED(rc)) |
496 | 498 | { |
497 | | -ereport(lev, ( |
498 | 499 | #if defined(WIN32) |
499 | | -errmsg("archive command was terminated by exception 0x%X",WTERMSIG(rc)), |
500 | | -errhint("See C include file \"ntstatus.h\" for a description of the hexadecimal value."), |
| 500 | +ereport(lev, |
| 501 | +(errmsg("archive command was terminated by exception 0x%X", |
| 502 | +WTERMSIG(rc)), |
| 503 | +errhint("See C include file \"ntstatus.h\" for a description of the hexadecimal value."), |
| 504 | +errdetail("The failed archive command was: %s", |
| 505 | +xlogarchcmd))); |
501 | 506 | #elif defined(HAVE_DECL_SYS_SIGLIST)&&HAVE_DECL_SYS_SIGLIST |
502 | | -errmsg("archive command was terminated by signal %d: %s", |
503 | | -WTERMSIG(rc), |
504 | | -WTERMSIG(rc)<NSIG ?sys_siglist[WTERMSIG(rc)] :"(unknown)"), |
| 507 | +ereport(lev, |
| 508 | +(errmsg("archive command was terminated by signal %d: %s", |
| 509 | +WTERMSIG(rc), |
| 510 | +WTERMSIG(rc)<NSIG ?sys_siglist[WTERMSIG(rc)] :"(unknown)"), |
| 511 | +errdetail("The failed archive command was: %s", |
| 512 | +xlogarchcmd))); |
505 | 513 | #else |
506 | | -errmsg("archive command was terminated by signal %d",WTERMSIG(exitstatus)), |
| 514 | +ereport(lev, |
| 515 | +(errmsg("archive command was terminated by signal %d", |
| 516 | +WTERMSIG(rc)), |
| 517 | +errdetail("The failed archive command was: %s", |
| 518 | +xlogarchcmd))); |
507 | 519 | #endif |
508 | | -errdetail("The failed archive command was: %s",xlogarchcmd))); |
509 | 520 | } |
510 | 521 | else |
511 | 522 | { |
512 | 523 | ereport(lev, |
513 | | -(errmsg("archive command exited with unrecognized status %d",rc), |
514 | | -errdetail("The failed archive command was: %s",xlogarchcmd))); |
| 524 | +(errmsg("archive command exited with unrecognized status %d", |
| 525 | +rc), |
| 526 | +errdetail("The failed archive command was: %s", |
| 527 | +xlogarchcmd))); |
515 | 528 | } |
516 | 529 |
|
517 | 530 | return false; |
|