From 7bbc664230f26a62884c4ca05ea0181d88964b7d Mon Sep 17 00:00:00 2001 From: Ian Barwick Date: Thu, 28 Jul 2016 16:32:07 +0900 Subject: [PATCH] Miscellaneous code cleanup and typo fixes --- HISTORY | 2 +- README.md | 2 +- log.c | 2 +- repmgr.c | 9 --------- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/HISTORY b/HISTORY index 69cff214..49e623b4 100644 --- a/HISTORY +++ b/HISTORY @@ -1,4 +1,4 @@ -3.1.4 2016-07- +3.1.4 2016-07-12 repmgr: new configuration option for setting "restore_command" in the recovery.conf file generated by repmgr (Martín) repmgr: add --csv option to "repmgr cluster show" (Gianni) diff --git a/README.md b/README.md index 56eaa045..bbe4b86b 100644 --- a/README.md +++ b/README.md @@ -1081,7 +1081,7 @@ the length of time it takes to determine that the connection is not possible. In particular explicitly setting a parameter for `connect_timeout` should be considered; the effective minimum value of `2` (seconds) will ensure that a connection failure at network level is reported as soon as possible, -otherwise dependeing on the system settings (e.g. `tcp_syn_retries` in Linux) +otherwise depending on the system settings (e.g. `tcp_syn_retries` in Linux) a delay of a minute or more is possible. For further details on `conninfo` network connection parameters, see: diff --git a/log.c b/log.c index 348b6db4..a16cee4e 100644 --- a/log.c +++ b/log.c @@ -142,7 +142,7 @@ log_verbose(int level, const char *fmt, ...) bool -logger_init(t_configuration_options * opts, const char *ident) +logger_init(t_configuration_options *opts, const char *ident) { char *level = opts->loglevel; char *facility = opts->logfacility; diff --git a/repmgr.c b/repmgr.c index 648ba7df..4605ef39 100644 --- a/repmgr.c +++ b/repmgr.c @@ -737,15 +737,6 @@ main(int argc, char **argv) } } -/* keywords[2] = "user"; - values[2] = (runtime_options.username[0]) ? runtime_options.username : NULL; - keywords[3] = "dbname"; - values[3] = runtime_options.dbname; - keywords[4] = "application_name"; - values[4] = (char *) progname(); - keywords[5] = NULL; - values[5] = NULL;*/ - /* * Initialize the logger. If verbose command line parameter was input, * make sure that the log level is at least INFO. This is mainly useful