hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Lowered debugging message verbosity somewhat

Browse source
This commit is contained in:
Thulinma 2019-08-12 10:42:15 +02:00
parent 6dc1b500d1
commit 7b12a5a2b5
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/config.cpp
View file

@ -342,7 +342,6 @@ int Util::Config::serveThreadedSocket(int (*callback)(Socket::Connection &)){
return 1; return 1;
} }
serv_sock_pointer = &server_socket; serv_sock_pointer = &server_socket;
DEVEL_MSG("Activating threaded server: %s", getString("cmd").c_str());
activate(); activate();
if (server_socket.getSocket()){ if (server_socket.getSocket()){
int oldSock = server_socket.getSocket(); int oldSock = server_socket.getSocket();
@ -370,7 +369,6 @@ int Util::Config::serveForkedSocket(int (*callback)(Socket::Connection &S)){
return 1; return 1;
} }
serv_sock_pointer = &server_socket; serv_sock_pointer = &server_socket;
DEVEL_MSG("Activating forked server: %s", getString("cmd").c_str());
activate(); activate();
if (server_socket.getSocket()){ if (server_socket.getSocket()){
int oldSock = server_socket.getSocket(); int oldSock = server_socket.getSocket();

10
lib/socket.cpp
View file

@ -1097,8 +1097,7 @@ Socket::Connection::Connection(const Connection& rhs){
clear(); clear();
if (!rhs){return;} if (!rhs){return;}
#if DEBUG >= DLVL_DEVEL #if DEBUG >= DLVL_DEVEL
INFO_MSG("Copying %s socket", rhs.sslConnected?"SSL":"regular"); HIGH_MSG("Copying %s socket", rhs.sslConnected?"SSL":"regular");
BACKTRACE;
#endif #endif
conntime = rhs.conntime; conntime = rhs.conntime;
isTrueSocket = rhs.isTrueSocket; isTrueSocket = rhs.isTrueSocket;
@ -1113,7 +1112,7 @@ Socket::Connection::Connection(const Connection& rhs){
if (rhs.sSend >= 0){sSend = dup(rhs.sSend);} if (rhs.sSend >= 0){sSend = dup(rhs.sSend);}
if (rhs.sRecv >= 0){sRecv = dup(rhs.sRecv);} if (rhs.sRecv >= 0){sRecv = dup(rhs.sRecv);}
#if DEBUG >= DLVL_DEVEL #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 #endif
#ifdef SSL #ifdef SSL
} }
@ -1126,8 +1125,7 @@ Socket::Connection& Socket::Connection::operator=(const Socket::Connection& rhs)
clear(); clear();
if (!rhs){return *this;} if (!rhs){return *this;}
#if DEBUG >= DLVL_DEVEL #if DEBUG >= DLVL_DEVEL
INFO_MSG("Assigning %s socket", rhs.sslConnected?"SSL":"regular"); HIGH_MSG("Assigning %s socket", rhs.sslConnected?"SSL":"regular");
BACKTRACE;
#endif #endif
conntime = rhs.conntime; conntime = rhs.conntime;
isTrueSocket = rhs.isTrueSocket; 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.sSend >= 0){sSend = dup(rhs.sSend);}
if (rhs.sRecv >= 0){sRecv = dup(rhs.sRecv);} if (rhs.sRecv >= 0){sRecv = dup(rhs.sRecv);}
#if DEBUG >= DLVL_DEVEL #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 #endif
#ifdef SSL #ifdef SSL
} }