Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29587
Modified Files:
merovingian.c merovingian_connections.c
Log Message:
get logging right, and unify messages for connections a bit
Index: merovingian_connections.c
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/backends/monet5/merovingian/merovingian_connections.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- merovingian_connections.c 7 Jan 2010 15:24:31 -0000 1.4
+++ merovingian_connections.c 24 Mar 2010 12:58:54 -0000 1.5
@@ -75,7 +75,7 @@
/* keep queue of 5 */
listen(sock, 5);
- Mfprintf(log, "listening for TCP connections on %s:%hu\n", host, port);
+ Mfprintf(log, "accepting connections on TCP socket %s:%hu\n", host,
port);
*ret = sock;
return(NO_ERR);
@@ -142,7 +142,7 @@
}
static err
-openConnectionUNIX(int *ret, char *path)
+openConnectionUNIX(int *ret, char *path, FILE *log)
{
struct sockaddr_un server;
int sock = -1;
@@ -163,7 +163,7 @@
/* keep queue of 5 */
listen(sock, 5);
- Mfprintf(_mero_ctlout, "handling commands over UNIX socket %s\n", path);
+ Mfprintf(log, "accepting connections on UNIX domain socket %s\n", path);
*ret = sock;
return(NO_ERR);
Index: merovingian.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/merovingian.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- merovingian.c 24 Mar 2010 12:51:17 -0000 1.72
+++ merovingian.c 24 Mar 2010 12:58:54 -0000 1.73
@@ -905,9 +905,9 @@
/* open up connections */
if (
(e = openConnectionTCP(&sock, _mero_port, stdout)) ==
NO_ERR &&
+ (e = openConnectionUNIX(&socku, bufu, stdout)) ==
NO_ERR &&
(e = openConnectionUDP(&usock, discoveryport)) ==
NO_ERR &&
- (e = openConnectionUNIX(&unsock, buf)) == NO_ERR &&
- (e = openConnectionUNIX(&socku, bufu)) == NO_ERR &&
+ (e = openConnectionUNIX(&unsock, buf, _mero_ctlout)) ==
NO_ERR &&
(_mero_controlport == 0 || (e =
openConnectionTCP(&csock, _mero_controlport, _mero_ctlout)) == NO_ERR)
)
{
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
