From b24181b26fc90758370e475088be4ef2497d3cc3 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Thu, 5 May 2011 23:11:51 +0300 Subject: [PATCH] Improve pg_archivecleanup and pg_standby --help output For consistency with other tools, put the options before further usage information. In pg_standby, remove the supposedly deprecated -l option from the given example invocation. --- contrib/pg_archivecleanup/pg_archivecleanup.c | 18 +++++++++--------- contrib/pg_standby/pg_standby.c | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/contrib/pg_archivecleanup/pg_archivecleanup.c b/contrib/pg_archivecleanup/pg_archivecleanup.c index d96eef2c5a..dd8a45133c 100644 --- a/contrib/pg_archivecleanup/pg_archivecleanup.c +++ b/contrib/pg_archivecleanup/pg_archivecleanup.c @@ -203,19 +203,19 @@ usage(void) printf("%s removes older WAL files from PostgreSQL archives.\n\n", progname); printf("Usage:\n"); printf(" %s [OPTION]... ARCHIVELOCATION OLDESTKEPTWALFILE\n", progname); - printf("\n" - "for use as an archive_cleanup_command in the recovery.conf when standby_mode = on:\n" - " archive_cleanup_command = 'pg_archivecleanup [OPTION]... ARCHIVELOCATION %%r'\n" - "e.g.\n" - " archive_cleanup_command = 'pg_archivecleanup /mnt/server/archiverdir %%r'\n"); - printf("\n" - "or for use as a standalone archive cleaner:\n" - "e.g.\n" - " pg_archivecleanup /mnt/server/archiverdir 000000010000000000000010.00000020.backup\n"); printf("\nOptions:\n"); printf(" -d generates debug output (verbose mode)\n"); printf(" --help show this help, then exit\n"); printf(" --version output version information, then exit\n"); + printf("\n" + "For use as archive_cleanup_command in recovery.conf when standby_mode = on:\n" + " archive_cleanup_command = 'pg_archivecleanup [OPTION]... ARCHIVELOCATION %%r'\n" + "e.g.\n" + " archive_cleanup_command = 'pg_archivecleanup /mnt/server/archiverdir %%r'\n"); + printf("\n" + "Or for use as a standalone archive cleaner:\n" + "e.g.\n" + " pg_archivecleanup /mnt/server/archiverdir 000000010000000000000010.00000020.backup\n"); printf("\nReport bugs to .\n"); } diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c index f25015fd14..4e38d9b6b2 100644 --- a/contrib/pg_standby/pg_standby.c +++ b/contrib/pg_standby/pg_standby.c @@ -515,11 +515,6 @@ usage(void) printf("%s allows PostgreSQL warm standby servers to be configured.\n\n", progname); printf("Usage:\n"); printf(" %s [OPTION]... ARCHIVELOCATION NEXTWALFILE XLOGFILEPATH [RESTARTWALFILE]\n", progname); - printf("\n" - "with main intended use as a restore_command in the recovery.conf:\n" - " restore_command = 'pg_standby [OPTION]... ARCHIVELOCATION %%f %%p %%r'\n" - "e.g.\n" - " restore_command = 'pg_standby -l /mnt/server/archiverdir %%f %%p %%r'\n"); printf("\nOptions:\n"); printf(" -c copies file from archive (default)\n"); printf(" -d generate lots of debugging output (testing only)\n"); @@ -534,6 +529,11 @@ usage(void) printf(" -w MAXWAITTIME max seconds to wait for a file (0=no limit) (default=0)\n"); printf(" --help show this help, then exit\n"); printf(" --version output version information, then exit\n"); + printf("\n" + "Main intended use as restore_command in recovery.conf:\n" + " restore_command = 'pg_standby [OPTION]... ARCHIVELOCATION %%f %%p %%r'\n" + "e.g.\n" + " restore_command = 'pg_standby /mnt/server/archiverdir %%f %%p %%r'\n"); printf("\nReport bugs to .\n"); }