Changeset 3034 for box/trunk

Timestamp:

31/10/2011 21:09:45 (7 months ago)

Author:

chris

Message:

Improve error message on bbackupd command socket bind failure, thanks to Christophe.

Location:

box/trunk/lib/server

Files:

• ServerException.txt (modified) (1 diff)
• SocketListen.h (modified) (1 diff)

box/trunk/lib/server/ServerException.txt

@@ -14 +14 @@
 SocketCloseError                                13
 SocketNameUNIXPathTooLong               14
-SocketBindError                                 16      Check the ListenAddresses directive in your config file -- must refer to local IP addresses only
+SocketBindError                                 16      Check the ListenAddresses directive (bbstored) or CommandSocket (bbackupd) in your config file -- must refer to local IP addresses (or existing writable path) only
 SocketAcceptError                               17
 ServerStreamBadListenAddrs              18

box/trunk/lib/server/SocketListen.h

@@ -167 +167 @@
                         || ::listen(mSocketHandle, ListenBacklog) == -1)
                 {
+                        int err_number = errno;
                         // Dispose of the socket
                         ::close(mSocketHandle);
                         mSocketHandle = -1;
-                        THROW_EXCEPTION(ServerException, SocketBindError)
+                        THROW_SYS_FILE_ERRNO("Failed to bind or listen "
+                                "on socket", Name, err_number,
+                                ServerException, SocketBindError);
                 }       
         }