Changeset 2115 for box/trunk/lib/server/SocketStream.cpp

Timestamp:

28/03/2008 22:18:44 (4 years ago)

Author:

chris

Message:

Improve logging with macros that consistently output strerror(errno) and
errno, replacing almost all use of strerror() in the main code.

Log a more detailed error message before throwing an exception for some
more system call failures.

Make FileStream? store its filename on all platforms, not just Windows.

Wrap some long lines at less than 80 characters to improve readability.

Fix some minor violations of coding standard (white space) and a typo
in a comment.

File:

• box/trunk/lib/server/SocketStream.cpp (modified) (11 diffs)

box/trunk/lib/server/SocketStream.cpp

@@ -151 +151 @@
 
         // Create the socket
-        mSocketHandle = ::socket(sockDomain, SOCK_STREAM, 0 /* let OS choose protocol */);
+        mSocketHandle = ::socket(sockDomain, SOCK_STREAM,
+                0 /* let OS choose protocol */);
         if(mSocketHandle == INVALID_SOCKET_VALUE)
         {
+                BOX_LOG_SYS_ERROR("Failed to create a network socket");
                 THROW_EXCEPTION(ServerException, SocketOpenError)
         }
@@ -164 +166 @@
                 DWORD err = WSAGetLastError();
                 ::closesocket(mSocketHandle);
-#else
+                BOX_LOG_WIN_ERROR_NUMBER("Failed to connect to socket " 
+                        "(type " << Type << ", name " << Name <<
+                        ", port " << Port << ")", err);
+#else // !WIN32
                 int err = errno;
                 ::close(mSocketHandle);
-#endif
-
-#ifdef WIN32
-                BOX_ERROR("Failed to connect to socket (type " << Type <<
-                        ", name " << Name << ", port " << Port << "): " <<
-                                GetErrorMessage(err)
-                        );
-#else
-                BOX_ERROR("Failed to connect to socket (type " << Type <<
-                        ", name " << Name << ", port " << Port << "): " <<
-                                strerror(err) << " (" << err << ")"
-                        );
-#endif
+                BOX_LOG_SYS_ERROR("Failed to connect to socket (type " <<
+                        Type << ", name " << Name << ", port " << Port <<
+                        ")");
+#endif // WIN32
 
                 mSocketHandle = INVALID_SOCKET_VALUE;
@@ -221 +217 @@
                         {
                                 // Bad!
-                                THROW_EXCEPTION(ServerException, SocketPollError)
+                                BOX_LOG_SYS_ERROR("Failed to poll socket");
+                                THROW_EXCEPTION(ServerException,
+                                        SocketPollError)
                         }
                         break;
@@ -251 +249 @@
                 {
                         // Other error
-                        THROW_EXCEPTION(ConnectionException, Conn_SocketReadError)
+                        BOX_LOG_SYS_ERROR("Failed to read from socket");
+                        THROW_EXCEPTION(ConnectionException,
+                                Conn_SocketReadError);
                 }
         }
+
         // Closed for reading?
         if(r == 0)
@@ -298 +299 @@
                         // Error.
                         mWriteClosed = true;    // assume can't write again
-                        THROW_EXCEPTION(ConnectionException, Conn_SocketWriteError)
+                        BOX_LOG_SYS_ERROR("Failed to write to socket");
+                        THROW_EXCEPTION(ConnectionException,
+                                Conn_SocketWriteError);
                 }
                 
@@ -311 +314 @@
                 if(bytesLeft > 0)
                 {
-                        TRACE3("Waiting to send data on socket %d, (%d to send of %d)\n", mSocketHandle, bytesLeft, NBytes);
+                        BOX_TRACE("Waiting to send data on socket " << 
+                                mSocketHandle << " (" << bytesLeft <<
+                                " of " << NBytes << " bytes left)");
                         
                         // Wait for data to send.
@@ -324 +329 @@
                                 if(errno != EINTR)
                                 {
-                                        THROW_EXCEPTION(ServerException, SocketPollError)
+                                        BOX_LOG_SYS_ERROR("Failed to poll "
+                                                "socket");
+                                        THROW_EXCEPTION(ServerException,
+                                                SocketPollError)
                                 }
                         }
@@ -351 +359 @@
 #endif
         {
+                BOX_LOG_SYS_ERROR("Failed to close socket");
                 THROW_EXCEPTION(ServerException, SocketCloseError)
         }
@@ -381 +390 @@
         if(::shutdown(mSocketHandle, how) == -1)
         {
+                BOX_LOG_SYS_ERROR("Failed to shutdown socket");
                 THROW_EXCEPTION(ConnectionException, Conn_SocketShutdownError)
         }
@@ -459 +469 @@
         socklen_t credLen = sizeof(cred);
 
-        if(::getsockopt(mSocketHandle, SOL_SOCKET, SO_PEERCRED, &cred, &credLen) == 0)
+        if(::getsockopt(mSocketHandle, SOL_SOCKET, SO_PEERCRED, &cred,
+                &credLen) == 0)
         {
                 rUidOut = cred.uid;
@@ -465 +476 @@
                 return true;
         }
+
+        BOX_LOG_SYS_ERROR("Failed to get peer credentials on socket");
 #endif