errno doesnt work with winsock, handle

mongodb · Jul 7, 2010 · a5a05a8 · a5a05a8
1 parent 16d3dc3
commit a5a05a8
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 4 deletions.
diff --git a/util/log.h b/util/log.h
@@ -324,10 +324,43 @@ namespace mongo {
     void initLogging( const string& logpath , bool append );
     void rotateLogs( int signal = 0 );
 
+    std::string toUtf8String(const std::wstring& wide);
+
     inline string errnoWithDescription(int x = errno) {
         stringstream s;
-        s << "errno:" << x << ' ' << strerror(x);
-        return s.str();
+        s << "errno:" << x << ' ';
+
+#if defined(_WIN32)
+        LPTSTR errorText = NULL;
+        FormatMessage(
+            FORMAT_MESSAGE_FROM_SYSTEM
+            |FORMAT_MESSAGE_ALLOCATE_BUFFER
+            |FORMAT_MESSAGE_IGNORE_INSERTS,  
+            NULL,
+            x, 0,
+            (LPTSTR) &errorText,  // output
+            0, // minimum size for output buffer
+            NULL);
+        if( errorText ) {
+            string x = toUtf8String(errorText);
+            s << x;
+            LocalFree(errorText);
+        }
+        else
+            s << strerror(x);
+        /*
+        DWORD n = FormatMessage( 
+            FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+            FORMAT_MESSAGE_FROM_SYSTEM | 
+            FORMAT_MESSAGE_IGNORE_INSERTS,
+            NULL, x, 
+            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+            (LPTSTR) &lpMsgBuf, 0, NULL);
+        */
+#else
+        s << strerror(x);
+#endif
+        return s.str();
     }
 
     /** output the error # and error message with prefix.  

diff --git a/util/message.cpp b/util/message.cpp
@@ -30,6 +30,12 @@
 
 #ifndef _WIN32
 #include <sys/resource.h>
+#else
+
+// errno doesn't work for winsock.
+#undef errno
+#define errno WSAGetLastError()
+
 #endif
 
 namespace mongo {
@@ -566,8 +572,9 @@ namespace mongo {
                 throw SocketException();
             }
             if ( ret == -1 ) {
-                if ( errno != EAGAIN || _timeout == 0 ) {                
-                    log(_logLevel) << "MessagingPort recv() " << errnoWithDescription() << " " << farEnd.toString()<<endl;
+                int e = errno;
+                if ( e != EAGAIN || _timeout == 0 ) {                
+                    log(_logLevel) << "MessagingPort recv() " << errnoWithDescription(e) << " " << farEnd.toString()<<endl;
                     throw SocketException();
                 } else {
                     if ( !serverAlive( farEnd.toString() ) ) {