github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-27 00:46:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

"repmgr cluster events": optionally omit "Details" column with --terse

Browse Source 
Implements GitHub #360.
This commit is contained in:
Ian Barwick
2018-01-04 09:48:00 +09:00
parent 486f8e5a2c
commit 83b8f05221
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
repmgr-action-cluster.c
View File

@@ -440,6 +440,7 @@ do_cluster_event(void)
PQExpBufferData where_clause; PQExpBufferData where_clause;
PGresult *res; PGresult *res;
int i = 0; int i = 0;
int column_count = EVENT_HEADER_COUNT;
conn = establish_db_connection(config_file_options.conninfo, true); conn = establish_db_connection(config_file_options.conninfo, true);
@@ -538,7 +539,11 @@ do_cluster_event(void)
strncpy(headers_event[EV_TIMESTAMP].title, _("Timestamp"), MAXLEN); strncpy(headers_event[EV_TIMESTAMP].title, _("Timestamp"), MAXLEN);
strncpy(headers_event[EV_DETAILS].title, _("Details"), MAXLEN); strncpy(headers_event[EV_DETAILS].title, _("Details"), MAXLEN);
for (i = 0; i < EVENT_HEADER_COUNT; i++) /* if --terse provided, simply omit the "Details" column */
if (runtime_options.terse == true)
column_count --;
for (i = 0; i < column_count; i++)
{ {
headers_event[i].max_length = strlen(headers_event[i].title); headers_event[i].max_length = strlen(headers_event[i].title);
} }
@@ -547,7 +552,7 @@ do_cluster_event(void)
{ {
int j; int j;
for (j = 0; j < EVENT_HEADER_COUNT; j++) for (j = 0; j < column_count; j++)
{ {
headers_event[j].cur_length = strlen(PQgetvalue(res, i, j)); headers_event[j].cur_length = strlen(PQgetvalue(res, i, j));
if (headers_event[j].cur_length > headers_event[j].max_length) if (headers_event[j].cur_length > headers_event[j].max_length)
@@ -558,7 +563,7 @@ do_cluster_event(void)
} }
for (i = 0; i < EVENT_HEADER_COUNT; i++) for (i = 0; i < column_count; i++)
{ {
if (i == 0) if (i == 0)
printf(" "); printf(" ");
@@ -571,14 +576,14 @@ do_cluster_event(void)
} }
printf("\n"); printf("\n");
printf("-"); printf("-");
for (i = 0; i < EVENT_HEADER_COUNT; i++) for (i = 0; i < column_count; i++)
{ {
int j; int j;
for (j = 0; j < headers_event[i].max_length; j++) for (j = 0; j < headers_event[i].max_length; j++)
printf("-"); printf("-");
if (i < (EVENT_HEADER_COUNT - 1)) if (i < (column_count - 1))
printf("-+-"); printf("-+-");
else else
printf("-"); printf("-");
@@ -591,13 +596,13 @@ do_cluster_event(void)
int j; int j;
printf(" "); printf(" ");
for (j = 0; j < EVENT_HEADER_COUNT; j++) for (j = 0; j < column_count; j++)
{ {
printf("%-*s", printf("%-*s",
headers_event[j].max_length, headers_event[j].max_length,
PQgetvalue(res, i, j)); PQgetvalue(res, i, j));
if (j < (EVENT_HEADER_COUNT - 1)) if (j < (column_count - 1))
printf(" | "); printf(" | ");
} }