From e3c3c22b6e3796eb6b55b49f906b805d9647eb65 Mon Sep 17 00:00:00 2001 From: Jaime Casanova Date: Mon, 25 Jun 2012 22:53:16 -0500 Subject: [PATCH] Improve the version message to actually show the repmgr version not only postgresql's one --- repmgr.c | 3 ++- repmgrd.c | 3 ++- version.h | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 version.h diff --git a/repmgr.c b/repmgr.c index 0b589141..51432af3 100644 --- a/repmgr.c +++ b/repmgr.c @@ -37,6 +37,7 @@ #include "config.h" #include "check_dir.h" #include "strutil.h" +#include "version.h" #define RECOVERY_FILE "recovery.conf" #define RECOVERY_DONE_FILE "recovery.done" @@ -125,7 +126,7 @@ main(int argc, char **argv) } if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0) { - printf("%s (PostgreSQL) " PG_VERSION "\n", progname); + printf("%s %s (PostgreSQL %s)\n", progname, REPMGR_VERSION, PG_VERSION); exit(SUCCESS); } } diff --git a/repmgrd.c b/repmgrd.c index e89e196c..8b9ff711 100644 --- a/repmgrd.c +++ b/repmgrd.c @@ -30,6 +30,7 @@ #include "config.h" #include "log.h" #include "strutil.h" +#include "version.h" #include "access/xlogdefs.h" #include "libpq/pqsignal.h" @@ -131,7 +132,7 @@ main(int argc, char **argv) } if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0) { - printf("%s (PostgreSQL) " PG_VERSION "\n", progname); + printf("%s %s (PostgreSQL %s)\n", progname, REPMGR_VERSION, PG_VERSION); exit(SUCCESS); } } diff --git a/version.h b/version.h new file mode 100644 index 00000000..f5fbf579 --- /dev/null +++ b/version.h @@ -0,0 +1,4 @@ +#ifndef _VERSION_H_ +#define _VERSION_H_ +#define REPMGR_VERSION "1.2.0" +#endif