Merge commit 'origin/master' into autofailover

Conflicts:
	config.c
	dbutils.c
	repmgr.c
	repmgrd.c

config.c

@@ -18,9 +18,9 @@
  */
 
 #include "config.h"
-#include "repmgr.h"
-#include "strutil.h"
 #include "log.h"
+#include "strutil.h"
+#include "repmgr.h"
 
 void
 parse_config(const char *config_file, t_configuration_options *options)

repmgr.c

@@ -757,6 +757,15 @@ do_standby_clone(void)
 		}
 	}
 
+	r = test_ssh_connection(runtime_options.host, runtime_options.remote_user);
+	if (r != 0)
+	{
+		log_err(_("%s: Aborting, remote host %s is not reachable.\n"), progname, runtime_options.host);
+		goto stop_backup;
+	}
+
+	log_notice(_("Starting backup...\n"));
+
 	/* Get the data directory full path and the configuration files location */
 	sqlquery_snprintf(sqlquery,
 	                  "SELECT name, setting "
@@ -884,6 +893,8 @@ do_standby_clone(void)
 		        progname, local_control_file);
 		goto stop_backup;
 	}
+
+	log_info(_("standby clone: master control file '%s'\n"), master_control_file);
 	r = copy_remote_files(runtime_options.host, runtime_options.remote_user,
 	                      master_control_file, local_control_file,
 	                      false);

repmgrd.c

@@ -161,7 +161,7 @@ main(int argc, char **argv)
 	parse_config(config_file, &local_options);
 	if (local_options.node == -1)
 	{
-		log_err(_("Node information is missing.\n"
+		log_err(_("Node information is missing. "
 		          "Check the configuration file, or provide one if you have not done so.\n"));
 		exit(ERR_BAD_CONFIG);
 	}