From 20b79f998c7e2e0c7328e1757851886f934f315d Mon Sep 17 00:00:00 2001
From: Ian Barwick <barwick@gmail.com>
Date: Fri, 1 Feb 2019 19:14:16 +0900
Subject: [PATCH] Define some previously magic numbers

---
 dbutils.c            |  8 ++++----
 repmgr-action-node.c | 26 +++++++++++++++++---------
 repmgr.h             |  1 +
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/dbutils.c b/dbutils.c
index d5f465b6..6af1d459 100644
--- a/dbutils.c
+++ b/dbutils.c
@@ -1511,8 +1511,8 @@ get_ready_archive_files(PGconn *conn, const char *data_directory)
 		log_error(_("unable to access archive_status directory \"%s\""),
 				  archive_status_dir);
 		log_detail("%s", strerror(errno));
-		/* XXX magic number */
-		return -1;
+
+		return ARCHIVE_STATUS_DIR_ERROR;
 	}
 
 	arcdir = opendir(archive_status_dir);
@@ -1522,8 +1522,8 @@ get_ready_archive_files(PGconn *conn, const char *data_directory)
 		log_error(_("unable to open archive directory \"%s\""),
 				  archive_status_dir);
 		log_detail("%s", strerror(errno));
-		/* XXX magic number */
-		return -1;
+
+		return ARCHIVE_STATUS_DIR_ERROR;
 	}
 
 	while ((arcdir_ent = readdir(arcdir)) != NULL)
diff --git a/repmgr-action-node.c b/repmgr-action-node.c
index c30f3669..0fb38b7c 100644
--- a/repmgr-action-node.c
+++ b/repmgr-action-node.c
@@ -221,19 +221,27 @@ do_node_status(void)
 
 		ready_files = get_ready_archive_files(conn, data_dir);
 
-		if (runtime_options.output_mode == OM_CSV)
+		if (ready_files == ARCHIVE_STATUS_DIR_ERROR)
 		{
-			key_value_list_set_format(&node_status,
-									  "WALs pending archiving",
-									  "%i",
-									  ready_files);
+			item_list_append_format(&warnings,
+									"- unable to check archive_status directory\n");
 		}
 		else
 		{
-			key_value_list_set_format(&node_status,
-									  "WALs pending archiving",
-									  "%i pending files",
-									  ready_files);
+			if (runtime_options.output_mode == OM_CSV)
+			{
+				key_value_list_set_format(&node_status,
+										  "WALs pending archiving",
+										  "%i",
+										  ready_files);
+			}
+			else
+			{
+				key_value_list_set_format(&node_status,
+										  "WALs pending archiving",
+										  "%i pending files",
+										  ready_files);
+			}
 		}
 
 		if (guc_set(conn, "archive_mode", "=", "off"))
diff --git a/repmgr.h b/repmgr.h
index 1dde2c8c..deb8c488 100644
--- a/repmgr.h
+++ b/repmgr.h
@@ -60,6 +60,7 @@
 #define UNKNOWN_NODE_ID		-1
 #define MIN_NODE_ID          1
 #define VOTING_TERM_NOT_SET -1
+#define ARCHIVE_STATUS_DIR_ERROR -1
 
 #define BDR2_REPLICATION_SET_NAME "repmgr"