Stop forcing logs from server-side write() and close() operations

This reverts commit 7ad04ef8ccaebe23cc30f90f3e9ffa04b3acd698 (DEBUG ONLY ErrorLogs).
Logging sockef fd was left, but in LogDebug logs, also in CloseSocket.

Change-Id: I3582b9080de7e2368a08030d75d0df15ed81c68e
(cherry picked from commit 61f9de0ce8213637b62ffccfd0c3a28ad8e6a374)

diff --git a/src/server/main/socket-manager.cpp b/src/server/main/socket-manager.cpp
index 46b1822aa6709a028e95327ff1f299c8242f1939..900647f385dd8b900a503a9ccaedfe22e6c05275 100644 (file)
--- a/src/server/main/socket-manager.cpp
+++ b/src/server/main/socket-manager.cpp
@@ -310,7 +310,6 @@ void SocketManager::ReadyForWriteBuffer(int sock) {
     auto &desc = m_socketDescriptionVector[sock];
     size_t size = desc.rawBuffer.size();
     ssize_t result = write(sock, &desc.rawBuffer[0], size);
-    LogError("[DEBUG ONLY] write result : " << result << " writing size: " << size << " on sock " << sock);
     if (result == -1) {
         int err = errno;
         switch (err) {
@@ -652,14 +651,14 @@ void SocketManager::ProcessQueue() {
             auto &desc = m_socketDescriptionVector[buffer.connectionID.sock];
 
             if (!desc.isOpen) {
-                LogError("Received packet for write but connection is closed. Packet ignored! Socket: "
+                LogDebug("Received packet for write but connection is closed. Packet ignored! Socket: "
                          << buffer.connectionID.sock);
                 continue;
             }
 
             if (desc.counter != buffer.connectionID.counter)
             {
-                LogError("Received packet for write but counter is broken. Packet ignored! Socket: "
+                LogDebug("Received packet for write but counter is broken. Packet ignored! Socket: "
                          << buffer.connectionID.sock);
                 continue;
             }
@@ -730,7 +729,7 @@ void SocketManager::ProcessQueue() {
 }
 
 void SocketManager::CloseSocket(int sock) {
-    LogError("[DEBUG ONLY] Closing socket: " << sock);
+    LogDebug("Closing socket: " << sock);
     auto &desc = m_socketDescriptionVector[sock];
 
     if (!(desc.isOpen)) {
@@ -760,7 +759,7 @@ void SocketManager::CloseSocket(int sock) {
     TEMP_FAILURE_RETRY(close(sock));
     FD_CLR(sock, &m_readSet);
     FD_CLR(sock, &m_writeSet);
-    LogError("[DEBUG ONLY] Closing socket done ");
+    LogDebug("Closing socket: " << sock << "  finished..");
 }
 
 time_t SocketManager::monotonicNow() {

diff --git a/src/server/service/service.cpp b/src/server/service/service.cpp
index 30b3dd73bf2ac0e807bd30664830ca878792a761..d8818665c41d3b7ad467082bf1a7e0df42cbc1d2 100644 (file)
--- a/src/server/service/service.cpp
+++ b/src/server/service/service.cpp
@@ -198,7 +198,7 @@ bool Service::processOne(const ConnectionID &conn, MessageBuffer &buffer,
 
     if (retval) {
         //send response
-        LogError("Writing response to client, size of serialized response: " << send.SerializedSize());
+        LogDebug("Writing response to client, size of serialized response: " << send.SerializedSize());
         m_serviceManager->Write(conn, send.Pop());
     } else {
         LogError("Closing socket because of error");
@@ -366,12 +366,11 @@ void Service::processGroupsGet(MessageBuffer &send)
 {
     std::vector<gid_t> groups;
     int ret = serviceImpl.policyGetGroups(groups);
-    LogError("[DEBUG ONLY] policyGetGroups return value: " << ret);
+
     Serialization::Serialize(send, ret);
     if (ret == SECURITY_MANAGER_SUCCESS) {
         Serialization::Serialize(send, groups);
     }
-    LogError("[DEBUG ONLY] processGroupsGet send serialized size: " << send.SerializedSize());
 }
 
 void Service::processGroupsForUid(MessageBuffer &recv, MessageBuffer &send)