Changeset: f8cba6941d5e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f8cba6941d5e
Modified Files:
tools/merovingian/ChangeLog.Jul2021
tools/merovingian/daemon/client.c
tools/merovingian/daemon/proxy.c
Branch: Jul2021
Log Message:
Disabled logging into merovingian.log of client connection info messages to
reduce size of log file
diffs (43 lines):
diff --git a/tools/merovingian/ChangeLog.Jul2021
b/tools/merovingian/ChangeLog.Jul2021
--- a/tools/merovingian/ChangeLog.Jul2021
+++ b/tools/merovingian/ChangeLog.Jul2021
@@ -1,3 +1,10 @@
# ChangeLog file for sql/src/backends/monet5/merovingian
# This file is updated with mchangelog
+* Fri Mar 18 2022 Sjoerd Mullender <sjo...@acm.org>
+- Disabled logging into merovingian.log of next info message types:
+ "proxying client <host>:<port> for database '<dbname>' to <url>" and
+ "target connection is on local UNIX domain socket, passing on filedescriptor
instead of proxying".
+ These messages were written to the log file at each connection. In most
+ cases this information is not used. The disabling reduces the log file size.
+
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
@@ -371,9 +371,11 @@ handleClient(void *data)
close_stream(fout);
close_stream(fdin);
} else {
+ /* Jan2022: disabled logging of next info message to reduce
merovingian.log size:
Mfprintf(stdout, "proxying client %s for database '%s' to "
"%s?database=%s\n",
host, database, redirs[0].conns->val,
redirs[0].dbname);
+ */
/* merovingian is in control, only consider the first redirect
*/
mnstr_printf(fout, "^mapi:merovingian://proxy?database=%s\n",
redirs[0].dbname);
diff --git a/tools/merovingian/daemon/proxy.c b/tools/merovingian/daemon/proxy.c
--- a/tools/merovingian/daemon/proxy.c
+++ b/tools/merovingian/daemon/proxy.c
@@ -184,8 +184,10 @@ startProxy(int psock, stream *cfdin, str
msg.msg_controllen = cmsg->cmsg_len;
msg.msg_flags = 0;
+ /* Jan2022: disabled logging of next info message to reduce
merovingian.log size:
Mfprintf(stdout, "target connection is on local UNIX domain
socket, "
"passing on filedescriptor instead of
proxying\n");
+ */
if (sendmsg(ssock, &msg, 0) < 0) {
closesocket(ssock);
return(newErr("could not send initial byte: %s",
strerror(errno)));
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
