MonetDB: Feb2013 - status: print how long the database is stopped

[Fabian Groffen]

Changeset: 50045c5f37f2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=50045c5f37f2
Modified Files:
        tools/merovingian/client/monetdb.c
Branch: Feb2013
Log Message:

status: print how long the database is stopped


diffs (27 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
@@ -308,10 +308,19 @@ printStatus(sabdb *stats, int mode, int 
                        strftime(info, sizeof(info), "crashed on %Y-%m-%d 
%H:%M:%S", t);
                }
 
-               if (stats->state != SABdbRunning && stats->state != 
SABdbStarting) {
-                       uptime[0] = '\0';
-               } else {
-                       secondsToString(uptime, time(NULL) - uplog.laststart, 
1);
+               switch (stats->state) {
+                       case SABdbRunning:
+                       case SABdbStarting:
+                               secondsToString(uptime, time(NULL) - 
uplog.laststart, 1);
+                               break;
+                       case SABdbInactive:
+                               if (uplog.laststop != -1) {
+                                       secondsToString(uptime, time(NULL) - 
uplog.laststop, 1);
+                                       break;
+                               } /* else fall through */
+                       default:
+                               uptime[0] = '\0';
+                               break;
                }
 
                /* cut too long names */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list