Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4895
Modified Files:
monetdb.mx
Log Message:
Don't emit double messages when starting, stopping or killing fails.
U monetdb.mx
Index: monetdb.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/monetdb.mx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- monetdb.mx 7 Apr 2008 18:57:14 -0000 1.19
+++ monetdb.mx 8 Apr 2008 10:58:59 -0000 1.20
@@ -494,6 +494,7 @@
sabdb *waitstats = NULL;
char *type = NULL;
char *p;
+ int ret = 0;
snprintf(path, 8095, "%s/.merovingian_control", dbfarm);
path[8095] = '\0';
@@ -564,7 +565,6 @@
if (doall == 1) {
sabdb *orig;
- int ret = 0;
/* don't even look at the arguments, because we are instructed
* to work on all known databases */
if ((e = SABAOTHgetStatus(&stats, NULL)) != MAL_SUCCEED) {
@@ -599,8 +599,9 @@
if (waitstats->state == SABdbCrashed) {
printf("CRASHED after shutting
down!\n");
ret = 1;
+ } else {
+ printf("done\n");
}
- printf("done\n");
SABAOTHfreeStatus(&waitstats);
}
} else if (mode == START && stats->state !=
SABdbRunning) {
@@ -635,8 +636,9 @@
if (waitstats->state == SABdbCrashed) {
printf("CRASHED during
startup!\n");
ret = 1;
+ } else {
+ printf("done\n");
}
- printf("done\n");
SABAOTHfreeStatus(&waitstats);
}
}
@@ -647,10 +649,8 @@
if (orig != NULL)
SABAOTHfreeStatus(&orig);
- /* indicate to the caller something went wrong */
- if (ret != 0)
- exit(ret);
- return;
+
+ exit(ret);
}
for (i = 1; i < argc; i++) {
@@ -694,11 +694,10 @@
} while
(waitstats->state == SABdbRunning);
if (waitstats->state ==
SABdbCrashed) {
printf("CRASHED
after shutting down!\n");
-
SABAOTHfreeStatus(&waitstats);
- fclose(f);
- exit(1);
+ ret = 1;
+ } else {
+
printf("done\n");
}
- printf("done\n");
SABAOTHfreeStatus(&waitstats);
}
} else if (mode == START) {
@@ -734,11 +733,10 @@
} while
(waitstats->state != SABdbCrashed);
if (waitstats->state ==
SABdbCrashed) {
printf("CRASHED
during startup!\n");
-
SABAOTHfreeStatus(&waitstats);
- fclose(f);
- exit(1);
+ ret = 1;
+ } else {
+
printf("done\n");
}
- printf("done\n");
SABAOTHfreeStatus(&waitstats);
}
}
@@ -750,6 +748,7 @@
}
fclose(f);
+ exit(ret);
}
static char seedChars[] = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Register now and save $200. Hurry, offer ends at 11:59 p.m.,
Monday, April 7! Use priority code J8TLD2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
