Changeset: 4f028dcaa640 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4f028dcaa640
Modified Files:
tools/merovingian/daemon/forkmserver.c
Branch: Aug2011
Log Message:
forkMserver: improve starting error messages
diffs (33 lines):
diff --git a/tools/merovingian/daemon/forkmserver.c
b/tools/merovingian/daemon/forkmserver.c
--- a/tools/merovingian/daemon/forkmserver.c
+++ b/tools/merovingian/daemon/forkmserver.c
@@ -375,6 +375,7 @@ forkMserver(char *database, sabdb** stat
/* if we've never found a connection, try to figure out why */
if (i >= 20) {
int state = (*stats)->state;
+ int hasconn = (*stats)->conns != NULL &&
(*stats)->conns->val != NULL;
/* starting failed */
msab_freeStatus(stats);
@@ -423,10 +424,17 @@ forkMserver(char *database, sabdb** stat
switch (state) {
case SABdbRunning:
- return(newErr(
- "timeout when
waiting for database '%s' to "
- "open up a
communication channel or to "
- "initialise the
sql scenario", database));
+ if (hasconn) {
+ return(newErr(
+
"timeout while waiting for database '%s' "
+ "to
initialise the sql scenario",
+
database));
+ } else {
+ return(newErr(
+
"timeout while waiting for database '%s' "
+ "to
open up a communication channel",
+
database));
+ }
case SABdbCrashed:
return(newErr(
"database '%s'
has crashed after starting, "
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
