Changeset: da50d8af4828 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da50d8af4828
Modified Files:
tools/merovingian/ChangeLog.Dec2011
tools/merovingian/daemon/controlrunner.c
Branch: Dec2011
Log Message:
recvWithTimeout: tweak logic involving mnstr_errnr return
Return something more useful, avoiding "error reading from control
channel" error messages in the log, as observed in bug #2984.
diffs (24 lines):
diff --git a/tools/merovingian/ChangeLog.Dec2011
b/tools/merovingian/ChangeLog.Dec2011
--- a/tools/merovingian/ChangeLog.Dec2011
+++ b/tools/merovingian/ChangeLog.Dec2011
@@ -2,6 +2,8 @@
# This file is updated with mchangelog
* Mon Jan 30 2012 Fabian Groffen <fab...@cwi.nl>
+- Fixed issue causing (harmless) 'error reading from control channel'
+ messages.
- Resolved problem where remote start/stop/etc. commands with monetdb
would report error 'OK'.
diff --git a/tools/merovingian/daemon/controlrunner.c
b/tools/merovingian/daemon/controlrunner.c
--- a/tools/merovingian/daemon/controlrunner.c
+++ b/tools/merovingian/daemon/controlrunner.c
@@ -118,7 +118,7 @@ recvWithTimeout(int msgsock, stream *fdi
/* stream.h is sooo broken :( */
memset(buf, '\0', buflen);
ret = mnstr_read_block(fdin, buf, buflen - 1, 1);
- return(ret >= 0 ? (int)strlen(buf) : -(mnstr_errnr(fdin) > 0));
+ return(ret >= 0 ? (int)strlen(buf) : mnstr_errnr(fdin) < 0 ? -1
: 0);
} else {
return(recv(msgsock, buf, buflen, 0));
}
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
