From a48d408e4ee119e168074d5de75d168057166eaf Mon Sep 17 00:00:00 2001
From: Ian Barwick <ian@2ndquadrant.com>
Date: Tue, 29 Jan 2019 12:10:55 +0900
Subject: [PATCH] Consistently log strerror output as DETAIL

---
 configfile.c | 6 +++---
 dbutils.c    | 5 ++---
 dirutil.c    | 5 +++--
 repmgrd.c    | 9 ++++++---
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/configfile.c b/configfile.c
index b44a8c7c..93f9cd80 100644
--- a/configfile.c
+++ b/configfile.c
@@ -123,9 +123,9 @@ load_config(const char *config_file, bool verbose, bool terse, t_configuration_o
 
 		if (stat(config_file_path, &stat_config) != 0)
 		{
-			log_error(_("provided configuration file \"%s\" not found: %s"),
-					  config_file,
-					  strerror(errno));
+			log_error(_("provided configuration file \"%s\" not found"),
+					  config_file);
+			log_detail("%s", strerror(errno));
 			exit(ERR_BAD_CONFIG);
 		}
 
diff --git a/dbutils.c b/dbutils.c
index 4971b84a..16f989f6 100644
--- a/dbutils.c
+++ b/dbutils.c
@@ -4376,9 +4376,8 @@ wait_connection_availability(PGconn *conn, long long timeout)
 		gettimeofday(&before, &tz);
 		if (select(sock, &read_set, NULL, NULL, &tmout) == -1)
 		{
-			log_warning(
-						_("wait_connection_availability(): select() returned with error:\n  %s"),
-						strerror(errno));
+			log_warning(_("wait_connection_availability(): select() returned with error"));
+			log_detail("%s", strerror(errno));
 			return -1;
 		}
 
diff --git a/dirutil.c b/dirutil.c
index 5fc7b74b..218522c8 100644
--- a/dirutil.c
+++ b/dirutil.c
@@ -351,8 +351,9 @@ create_pg_dir(const char *path, bool force)
 			}
 			break;
 		case DIR_ERROR:
-			log_error(_("could not access directory \"%s\": %s"),
-					  path, strerror(errno));
+			log_error(_("could not access directory \"%s\"")
+					  , path);
+			log_detail("%s", strerror(errno));
 			return false;
 	}
 
diff --git a/repmgrd.c b/repmgrd.c
index ddb0b8d2..86f124b0 100644
--- a/repmgrd.c
+++ b/repmgrd.c
@@ -618,7 +618,8 @@ daemonize_process(void)
 	switch (pid)
 	{
 		case -1:
-			log_error(_("error in fork():\n  %s"), strerror(errno));
+			log_error(_("error in fork()"));
+			log_detail("%s", strerror(errno));
 			exit(ERR_SYS_FAILURE);
 			break;
 
@@ -627,7 +628,8 @@ daemonize_process(void)
 			pid = setsid();
 			if (pid == (pid_t) -1)
 			{
-				log_error(_("error in setsid():\n  %s"), strerror(errno));
+				log_error(_("error executing setsid()"));
+				log_detail("%s", strerror(errno));
 				exit(ERR_SYS_FAILURE);
 			}
 
@@ -637,7 +639,8 @@ daemonize_process(void)
 			/* error case */
 			if (pid == -1)
 			{
-				log_error(_("error in fork():\n  %s"), strerror(errno));
+				log_error(_("error executing fork()"));
+				log_detail("%s", strerror(errno));
 				exit(ERR_SYS_FAILURE);
 			}