Revert "Enhance logs in case of socket problems, client hangs on waitForSocket()"

This reverts commit 3f59f6b73c66bdc4cc3fd91eaa7eef1d2abe1aa0.

Change-Id: I279ddc1a9b4213429960afd9060af049f0f4c057

diff --git a/src/common/connection.cpp b/src/common/connection.cpp
index 48d3746..cad42aa 100644 (file)
--- a/src/common/connection.cpp
+++ b/src/common/connection.cpp
@@ -51,7 +51,6 @@ int waitForSocket(int sock, int event, int timeout) {
     pollfd desc[1];
     desc[0].fd = sock;
     desc[0].events = event;
-    LogError("[DEBUG ONLY] waitForSocket " << sock);
 
     while((-1 == (retval = poll(desc, 1, timeout))) && (errno == EINTR)) {
         timeout >>= 1;
@@ -59,7 +58,7 @@ int waitForSocket(int sock, int event, int timeout) {
     }
 
     if (0 == retval) {
-        LogError("[DEBUG ONLY] Poll timeout");
+        LogDebug("Poll timeout");
     } else if (-1 == retval) {
         int err = errno;
         LogError("Error in poll: " << GetErrnoString(err));
@@ -92,8 +91,6 @@ public:
             return SECURITY_MANAGER_ERROR_SOCKET;
         }
 
-        LogError("[DEBUG ONLY] m_sock= " << m_sock);
-
         if ((flags = fcntl(m_sock, F_GETFL, 0)) < 0 ||
             fcntl(m_sock, F_SETFL, flags | O_NONBLOCK) < 0)
         {
@@ -115,7 +112,6 @@ public:
 
         LogDebug("ClientAddr.sun_path = " << interface);
 
-        LogError("[DEBUG ONLY] m_sock= " << m_sock);
         int retval = TEMP_FAILURE_RETRY(connect(m_sock, (struct sockaddr*)&clientAddr, SUN_LEN(&clientAddr)));
         if ((retval == -1) && (errno == EINPROGRESS)) {
             if (0 >= waitForSocket(m_sock, POLLOUT, POLL_TIMEOUT)) {

diff --git a/src/server/main/socket-manager.cpp b/src/server/main/socket-manager.cpp
index 07b5925..46b1822 100644 (file)
--- a/src/server/main/socket-manager.cpp
+++ b/src/server/main/socket-manager.cpp
@@ -209,7 +209,7 @@ void SocketManager::ReadyForAccept(int sock) {
     struct sockaddr_un clientAddr;
     unsigned int clientLen = sizeof(clientAddr);
     int client = accept4(sock, (struct sockaddr*) &clientAddr, &clientLen, SOCK_NONBLOCK);
-    LogError("[DEBUG ONLY] Accept on sock: " << sock << " Socket opended: " << client);
+//    LogInfo("Accept on sock: " << sock << " Socket opended: " << client);
     if (-1 == client) {
         int err = errno;
         LogError("Error in accept: " << GetErrnoString(err));
@@ -245,7 +245,7 @@ void SocketManager::ReadyForRead(int sock) {
     ssize_t size = read(sock, &event.rawBuffer[0], 4096);
 
     if (size == 0) {
-        LogError("[DEBUG ONLY] Reading returned 0 bytes, closing socket: " << sock);
+        LogDebug("Reading returned 0 bytes, closing socket: " << sock);
         CloseSocket(sock);
     } else if (size >= 0) {
         event.rawBuffer.resize(size);
@@ -426,7 +426,7 @@ void SocketManager::MainLoop() {
             // and connection is open. Time to close it!
             // Putting new timeout in queue here is pointless.
             desc.isTimeout = false;
-            LogError("[DEBUG ONLY] Closing socket because of timeout: " << pqTimeout.sock);
+            LogWarning("Closing socket because of timeout: " << pqTimeout.sock);
             CloseSocket(pqTimeout.sock);
 
             // All done. Now we should process next select ;-)
@@ -485,12 +485,12 @@ int SocketManager::GetSocketFromSystemD(
         if (0 < sd_is_socket_unix(fd, SOCK_STREAM, 1,
                                   desc.serviceHandlerPath.c_str(), 0))
         {
-            LogError("[DEBUG ONLY] Useable socket " << desc.serviceHandlerPath <<
+            LogInfo("Useable socket " << desc.serviceHandlerPath <<
                 " was passed by SystemD under descriptor " << fd);
             return fd;
         }
     }
-    LogError("[DEBUG ONLY] No useable sockets were passed by systemd.");
+    LogInfo("No useable sockets were passed by systemd.");
     return -1;
 }
 
@@ -583,7 +583,7 @@ void SocketManager::CreateDomainSocket(
     description.useSendMsg = desc.useSendMsg;
     description.service = service;
 
-    LogError("[DEBUG ONLY] Listen on socket: " << sockfd <<
+    LogDebug("Listen on socket: " << sockfd <<
         " Handler: " << desc.serviceHandlerPath.c_str());
 }
 
@@ -598,7 +598,6 @@ void SocketManager::RegisterSocketService(GenericSocketService *service) {
         {
             auto &desc = m_socketDescriptionVector[i];
             if (desc.service == service && desc.isOpen) {
-                LogError("[DEBUG ONLY] Closing socket: " << i);
                 close(i);
                 desc.isOpen = false;
             }
@@ -686,14 +685,14 @@ void SocketManager::ProcessQueue() {
             auto &desc = m_socketDescriptionVector[data.connectionID.sock];
 
             if (!desc.isOpen) {
-                LogError("Received packet for sendmsg but connection is closed. Packet ignored! Socket: "
+                LogDebug("Received packet for sendmsg but connection is closed. Packet ignored! Socket: "
                           << data.connectionID.sock);
                 continue;
             }
 
             if (desc.counter != data.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: "
                           << data.connectionID.sock);
                 continue;
             }