Changeset: 3543f4c8c4d1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3543f4c8c4d1
Modified Files:
tools/merovingian/daemon/client.c
tools/merovingian/daemon/merovingian.h
Branch: default
Log Message:
Avoid loosing error messages.
diffs (25 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
@@ -400,8 +400,9 @@ handleClient(void *data)
algos, MONETDB5_PASSWDHASH);
mnstr_flush(fout);
mnstr_read_block(fdin, buf, 8095, 1); /* eat away
client response */
- mnstr_printf(fout, "!monetdbd: an internal error has
occurred, refer to the logs for details, please try again later\n");
+ mnstr_printf(fout, "!monetdbd: an internal error has
occurred '%s', refer to the logs for details, please try again later\n",e);
mnstr_flush(fout);
+ Mfprintf(_mero_ctlerr, "!monetdbd: an internal error
has occurred '%s'\n",e);
close_stream(fout);
close_stream(fdin);
Mfprintf(stdout, "starting a proxy failed: %s\n", e);
diff --git a/tools/merovingian/daemon/merovingian.h
b/tools/merovingian/daemon/merovingian.h
--- a/tools/merovingian/daemon/merovingian.h
+++ b/tools/merovingian/daemon/merovingian.h
@@ -35,6 +35,7 @@ typedef char* err;
/* when not writing to stderr, one has to flush, make it easy to do so */
#define Mfprintf(S, ...) \
+ if( S)
\
do {
\
fprintf(S, __VA_ARGS__); \
fflush(S);
\
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
