Changeset: 5e603008641c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5e603008641c
Modified Files:
tools/merovingian/client/monetdb.c
Branch: Feb2013
Log Message:
printStatus: (really) squeeze uri's when they are too long
diffs (39 lines):
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -271,6 +271,7 @@ printStatus(sabdb *stats, int mode, int
char avg[8];
char info[32];
char *dbname;
+ char *uri;
switch (stats->state) {
case SABdbStarting:
@@ -313,18 +314,22 @@ printStatus(sabdb *stats, int mode, int
secondsToString(uptime, time(NULL) - uplog.laststart,
1);
}
- /* cut too long database names */
+ /* cut too long names */
dbname = malloc(sizeof(char) * (dbwidth + 1));
abbreviateString(dbname, stats->dbname, dbwidth);
+ uri = malloc(sizeof(char) * (uriwidth + 1));
+ abbreviateString(uri,
+ info[0] != '\0' ? info : stats->uri ?
stats->uri : "",
+ uriwidth);
/* dbname | state | health | uri/crash */
- printf("%-*s %c%c%3s", dbwidth,
- dbname, locked ? locked : state, locked ? state
: ' ', uptime);
+ printf("%-*s %c%c%3s", dbwidth, dbname,
+ locked ? locked : state, locked ? state : ' ',
uptime);
free(dbname);
if (uplog.startcntr)
secondsToString(avg, uplog.avguptime, 1);
printf(" %3d%% %3s %-*s",
- 100 - (uplog.crashcntr * 100 /
uplog.startcntr),
- avg, uriwidth, info[0] != '\0' ? info :
stats->uri ? stats->uri : "");
+ 100 - (uplog.crashcntr * 100 /
uplog.startcntr), avg,
+ uriwidth, uri);
printf("\n");
} else if (mode == 2) {
/* long mode */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
