github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-26 16:46:28 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Display default connection options in --help output

Browse Source
This commit is contained in:
Ian Barwick
2016-01-20 15:46:41 +09:00
parent ba71e1eedf
commit 7598e08b6f
2 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
repmgr.c
View File

@@ -141,6 +141,7 @@ static char pg_bindir[MAXLEN] = "";
static char repmgr_slot_name[MAXLEN] = ""; static char repmgr_slot_name[MAXLEN] = "";
static char *repmgr_slot_name_ptr = NULL; static char *repmgr_slot_name_ptr = NULL;
static char path_buf[MAXLEN] = ""; static char path_buf[MAXLEN] = "";
static char default_db[MAXLEN] = "";
/* Collate command line errors and warnings here for friendlier reporting */ /* Collate command line errors and warnings here for friendlier reporting */
ErrorList cli_errors = { NULL, NULL }; ErrorList cli_errors = { NULL, NULL };
@@ -194,6 +195,21 @@ main(int argc, char **argv)
set_progname(argv[0]); set_progname(argv[0]);
/* Initialise some defaults */
if (getenv("PGDATABASE"))
{
strncpy(default_db, getenv("PGDATABASE"), MAXLEN);
}
else if (getenv("PGUSER"))
{
strncpy(default_db, getenv("PGUSER"), MAXLEN);
}
if (!strlen(default_db))
{
strncpy(default_db, DEFAULT_DBNAME, MAXLEN);
}
/* Prevent getopt_long() from printing an error message */ /* Prevent getopt_long() from printing an error message */
opterr = 0; opterr = 0;
@@ -514,12 +530,7 @@ main(int argc, char **argv)
if (!runtime_options.dbname[0]) if (!runtime_options.dbname[0])
{ {
if (getenv("PGDATABASE")) strncpy(runtime_options.dbname, default_db, MAXLEN);
strncpy(runtime_options.dbname, getenv("PGDATABASE"), MAXLEN);
else if (getenv("PGUSER"))
strncpy(runtime_options.dbname, getenv("PGUSER"), MAXLEN);
else
strncpy(runtime_options.dbname, DEFAULT_DBNAME, MAXLEN);
} }
/* /*
@@ -528,7 +539,7 @@ main(int argc, char **argv)
*/ */
if (!runtime_options.masterport[0]) if (!runtime_options.masterport[0])
{ {
strncpy(runtime_options.masterport, DEFAULT_MASTER_PORT, MAXLEN); strncpy(runtime_options.masterport, DEF_PGPORT_STR, MAXLEN);
} }
/* /*
@@ -3706,10 +3717,16 @@ do_help(void)
printf(_(" -t, --terse don't display hints and other non-critical output\n")); printf(_(" -t, --terse don't display hints and other non-critical output\n"));
printf(_("\n")); printf(_("\n"));
printf(_("Connection options:\n")); printf(_("Connection options:\n"));
printf(_(" -d, --dbname=DBNAME database to connect to\n")); printf(_(" -d, --dbname=DBNAME database to connect to (default: %s)\n"), default_db);
printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));
printf(_(" -p, --port=PORT database server port\n")); printf(_(" -p, --port=PORT database server port (default: %s)\n"), DEF_PGPORT_STR);
printf(_(" -U, --username=USERNAME database user name to connect as\n")); printf(_(" -U, --username=USERNAME database user name to connect as"));
if (getenv("PGUSER"))
{
printf(_(" (default: %s)"), getenv("PGUSER"));
}
printf("\n");
printf(_("\n")); printf(_("\n"));
printf(_("General configuration options:\n")); printf(_("General configuration options:\n"));
printf(_(" -b, --pg_bindir=PATH path to PostgreSQL binaries (optional)\n")); printf(_(" -b, --pg_bindir=PATH path to PostgreSQL binaries (optional)\n"));
@@ -5114,7 +5131,8 @@ format_db_cli_params(const char *conninfo, char *output)
} }
bool copy_file(const char *old_filename, const char *new_filename) bool
copy_file(const char *old_filename, const char *new_filename)
{ {
FILE *ptr_old, *ptr_new; FILE *ptr_old, *ptr_new;
int a; int a;
@@ -5152,3 +5170,4 @@ bool copy_file(const char *old_filename, const char *new_filename)
return true; return true;
} }

1
repmgr.h
View File

@@ -38,7 +38,6 @@
#define DEFAULT_WAL_KEEP_SEGMENTS "5000" #define DEFAULT_WAL_KEEP_SEGMENTS "5000"
#define DEFAULT_DEST_DIR "." #define DEFAULT_DEST_DIR "."
#define DEFAULT_MASTER_PORT "5432"
#define DEFAULT_DBNAME "postgres" #define DEFAULT_DBNAME "postgres"
#define DEFAULT_REPMGR_SCHEMA_PREFIX "repmgr_" #define DEFAULT_REPMGR_SCHEMA_PREFIX "repmgr_"
#define DEFAULT_PRIORITY 100 #define DEFAULT_PRIORITY 100