From b48ffb1c7a2b4d5b003006a23e776e19ecc05757 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Mon, 12 Aug 2019 10:42:15 +0200
Subject: [PATCH] Lowered debugging message verbosity somewhat
---
lib/config.cpp | 2 --
lib/socket.cpp | 10 ++++------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/lib/config.cpp b/lib/config.cpp
index 32f7729c..238a369d 100644
--- a/lib/config.cpp
+++ b/lib/config.cpp
@@ -371,7 +371,6 @@ int Util::Config::serveThreadedSocket(int (*callback)(Socket::Connection &)){
return 1;
}
serv_sock_pointer = &server_socket;
- DEVEL_MSG("Activating threaded server: %s", getString("cmd").c_str());
activate();
if (server_socket.getSocket()){
int oldSock = server_socket.getSocket();
@@ -399,7 +398,6 @@ int Util::Config::serveForkedSocket(int (*callback)(Socket::Connection &S)){
return 1;
}
serv_sock_pointer = &server_socket;
- DEVEL_MSG("Activating forked server: %s", getString("cmd").c_str());
activate();
if (server_socket.getSocket()){
int oldSock = server_socket.getSocket();
diff --git a/lib/socket.cpp b/lib/socket.cpp
index a62b33f6..87979b6f 100644
--- a/lib/socket.cpp
+++ b/lib/socket.cpp
@@ -1097,8 +1097,7 @@ Socket::Connection::Connection(const Connection& rhs){
clear();
if (!rhs){return;}
#if DEBUG >= DLVL_DEVEL
- INFO_MSG("Copying %s socket", rhs.sslConnected?"SSL":"regular");
- BACKTRACE;
+ HIGH_MSG("Copying %s socket", rhs.sslConnected?"SSL":"regular");
#endif
conntime = rhs.conntime;
isTrueSocket = rhs.isTrueSocket;
@@ -1113,7 +1112,7 @@ Socket::Connection::Connection(const Connection& rhs){
if (rhs.sSend >= 0){sSend = dup(rhs.sSend);}
if (rhs.sRecv >= 0){sRecv = dup(rhs.sRecv);}
#if DEBUG >= DLVL_DEVEL
- INFO_MSG("Socket original = (%d / %d), copy = (%d / %d)", rhs.sSend, rhs.sRecv, sSend, sRecv);
+ HIGH_MSG("Socket original = (%d / %d), copy = (%d / %d)", rhs.sSend, rhs.sRecv, sSend, sRecv);
#endif
#ifdef SSL
}
@@ -1126,8 +1125,7 @@ Socket::Connection& Socket::Connection::operator=(const Socket::Connection& rhs)
clear();
if (!rhs){return *this;}
#if DEBUG >= DLVL_DEVEL
- INFO_MSG("Assigning %s socket", rhs.sslConnected?"SSL":"regular");
- BACKTRACE;
+ HIGH_MSG("Assigning %s socket", rhs.sslConnected?"SSL":"regular");
#endif
conntime = rhs.conntime;
isTrueSocket = rhs.isTrueSocket;
@@ -1142,7 +1140,7 @@ Socket::Connection& Socket::Connection::operator=(const Socket::Connection& rhs)
if (rhs.sSend >= 0){sSend = dup(rhs.sSend);}
if (rhs.sRecv >= 0){sRecv = dup(rhs.sRecv);}
#if DEBUG >= DLVL_DEVEL
- INFO_MSG("Socket original = (%d / %d), copy = (%d / %d)", rhs.sSend, rhs.sRecv, sSend, sRecv);
+ HIGH_MSG("Socket original = (%d / %d), copy = (%d / %d)", rhs.sSend, rhs.sRecv, sSend, sRecv);
#endif
#ifdef SSL
}