From: Bartlomiej Grzelewski Date: Thu, 8 Aug 2013 09:46:00 +0000 (+0200) Subject: Reduce number of logs. X-Git-Tag: 2.2.1_release^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e2c1b30932b920db06ac495341de03c5b9a9d4c;p=framework%2Fsecurity%2Fsecurity-server.git Reduce number of logs. Now core of security-server2 won't log any information about timeouts. All debug logs in socket-manager were removed. This patch should reduce number of logs for 50%. [Issue#] SSDWSSP-447 [Bug/Problem] Security-server generates too many logs. [Cause] New implementation was tested. [Solution] Decrease number of logs. [Verification] Build, run tests. Change-Id: I9c3cec96f1ca4899e8a95c988cd9dc56cf2d9db5 --- diff --git a/src/server2/common/socket-buffer.cpp b/src/server2/common/socket-buffer.cpp index 688186a..682547a 100644 --- a/src/server2/common/socket-buffer.cpp +++ b/src/server2/common/socket-buffer.cpp @@ -29,7 +29,6 @@ namespace SecurityServer { void SocketBuffer::Push(const RawBuffer &data) { - LogDebug("Push data: " << data.size()); m_buffer.AppendCopy(&data[0], data.size()); } @@ -44,7 +43,6 @@ RawBuffer SocketBuffer::Pop() { bool SocketBuffer::Ready() { CountBytesLeft(); - LogInfo("m_buffer.Size() == " << m_buffer.Size()); if (m_bytesLeft == 0) return false; if (m_bytesLeft > m_buffer.Size()) diff --git a/src/server2/main/socket-manager.cpp b/src/server2/main/socket-manager.cpp index beef398..1f6c0d1 100644 --- a/src/server2/main/socket-manager.cpp +++ b/src/server2/main/socket-manager.cpp @@ -119,9 +119,8 @@ SocketManager::~SocketManager() { void SocketManager::ReadyForAccept(int sock) { struct sockaddr_un clientAddr; unsigned int clientLen = sizeof(clientAddr); - LogInfo("Accept on sock: " << sock); int client = accept4(sock, (struct sockaddr*) &clientAddr, &clientLen, SOCK_NONBLOCK); - LogInfo("Socket opended: " << client); +// LogInfo("Accept on sock: " << sock << " Socket opended: " << client); if (-1 == client) { int err = errno; LogDebug("Error in accept: " << strerror(err)); @@ -257,8 +256,8 @@ void SocketManager::MainLoop() { ptrTimeout->tv_sec = currentTime < pqTimeout.time ? pqTimeout.time - currentTime : 0; ptrTimeout->tv_usec = 0; - LogDebug("Set up timeout: " << (int)ptrTimeout->tv_sec - << " seconds. Socket: " << pqTimeout.sock); +// LogDebug("Set up timeout: " << (int)ptrTimeout->tv_sec +// << " seconds. Socket: " << pqTimeout.sock); } int ret = select(m_maxDesc+1, &readSet, &writeSet, NULL, ptrTimeout); @@ -430,7 +429,6 @@ void SocketManager::CreateDomainSocket( } void SocketManager::RegisterSocketService(GenericSocketService *service) { - LogDebug("Pointer to service " << (void*) service); service->SetSocketManager(this); auto serviceVector = service->GetServiceDescription(); Try { @@ -520,7 +518,7 @@ void SocketManager::ProcessQueue() { } void SocketManager::CloseSocket(int sock) { - LogInfo("Closing socket: " << sock); +// LogInfo("Closing socket: " << sock); auto &desc = m_socketDescriptionVector[sock]; if (!(desc.isOpen)) {