Changeset: bd6c6a094340 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bd6c6a094340
Modified Files:
tools/merovingian/daemon/client.c
tools/merovingian/daemon/forkmserver.c
Branch: Dec2016
Log Message:
Mention name of logfile in message telling user to look in the logfile.
Also don't mention that the user should look in the logfile twice
(using a simple heuristic: if the message from monetdbd contains the
string "logfile", monetdb doesn't add a reference to the logfile).
This should fix at least part of bug 6067.
diffs (51 lines):
diff --git a/tools/merovingian/daemon/client.c
b/tools/merovingian/daemon/client.c
--- a/tools/merovingian/daemon/client.c
+++ b/tools/merovingian/daemon/client.c
@@ -288,7 +288,7 @@ handleClient(void *data)
if (top == NULL) {
mnstr_printf(fout, "!monetdbd: no such database '%s',
please create it first\n", database);
} else {
- mnstr_printf(fout, "!monetdbd: internal error while
starting mserver '%s', please refer to the logs\n",e);
+ mnstr_printf(fout, "!monetdbd: internal error while
starting mserver '%s'%s\n", e, strstr(e, "logfile")?"":", please refer to the
logs");
Mfprintf(_mero_ctlerr, "!monetdbd: an internal error
has occurred '%s'\n",e);
}
mnstr_flush(fout);
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
@@ -686,26 +686,29 @@ forkMserver(char *database, sabdb** stat
"(sabaoth
administration reports running, "
"but process seems
gone), "
"review monetdbd's "
- "logfile for any
peculiarities", database));
+ "logfile (%s) for
any peculiarities", database,
+
getConfVal(_mero_props, "logfile")));
case SABdbCrashed:
return(newErr(
"database '%s' has
crashed after starting, "
"manual intervention
needed, "
- "check monetdbd's
logfile for details",
- database));
+ "check monetdbd's
logfile (%s) for details",
+ database,
getConfVal(_mero_props, "logfile")));
case SABdbInactive:
return(newErr(
"database '%s'
appears to shut "
"itself down after
starting, "
- "check monetdbd's
logfile for possible "
- "hints", database));
+ "check monetdbd's
logfile (%s) for possible "
+ "hints", database,
+
getConfVal(_mero_props, "logfile")));
case SABdbStarting:
return(newErr(
"database '%s' has
inconsistent state "
"(sabaoth
administration reports starting up, "
"but process seems
gone), "
"review monetdbd's "
- "logfile for any
peculiarities", database));
+ "logfile (%s) for
any peculiarities", database,
+
getConfVal(_mero_props, "logfile")));
default:
return(newErr("unknown state: %d",
(int)state));
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
