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

Minor code fixes to "cluster show"/"daemon status" formatting

Browse Source
This commit is contained in:
Ian Barwick
2019-05-14 11:35:46 +09:00
parent b938f10206
commit ae44012383
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
repmgr-action-cluster.c
View File

@@ -64,6 +64,7 @@ static void cube_set_node_status(t_node_status_cube **cube, int n, int node_id,
* CLUSTER SHOW * CLUSTER SHOW
* *
* Parameters: * Parameters:
* --compact
* --csv * --csv
*/ */
void void
@@ -143,7 +144,7 @@ do_cluster_show(void)
for (cell = nodes.head; cell; cell = cell->next) for (cell = nodes.head; cell; cell = cell->next)
{ {
PQExpBufferData details; PQExpBufferData node_status;
PQExpBufferData buf; PQExpBufferData buf;
cell->node_info->conn = establish_db_connection_quiet(cell->node_info->conninfo); cell->node_info->conn = establish_db_connection_quiet(cell->node_info->conninfo);
@@ -169,13 +170,15 @@ do_cluster_show(void)
} }
} }
initPQExpBuffer(&details); initPQExpBuffer(&node_status);
if (format_node_status(cell->node_info, &details, &warnings) == true) if (format_node_status(cell->node_info, &node_status, &warnings) == true)
error_found = true; error_found = true;
strncpy(cell->node_info->details, details.data, MAXLEN);
termPQExpBuffer(&details); snprintf(cell->node_info->details, sizeof(cell->node_info->details),
"%s", node_status.data);
termPQExpBuffer(&node_status);
PQfinish(cell->node_info->conn); PQfinish(cell->node_info->conn);
cell->node_info->conn = NULL; cell->node_info->conn = NULL;

11
repmgr-action-daemon.c
View File

@@ -230,12 +230,13 @@ do_daemon_status(void)
} }
{ {
PQExpBufferData details; PQExpBufferData node_status;
initPQExpBuffer(&details); initPQExpBuffer(&node_status);
(void)format_node_status(cell->node_info, &details, &warnings); (void)format_node_status(cell->node_info, &node_status, &warnings);
strncpy(repmgrd_info[i]->pg_running_text, details.data, MAXLEN); snprintf(repmgrd_info[i]->pg_running_text, sizeof(cell->node_info->details),
termPQExpBuffer(&details); "%s", node_status.data);
termPQExpBuffer(&node_status);
} }
PQfinish(cell->node_info->conn); PQfinish(cell->node_info->conn);