[Box Backup-commit] COMMIT r2227 - box/trunk/bin/bbackupd

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2008-08-08 23:49:42 +0100 (Fri, 08 Aug 2008)
New Revision: 2227

Modified:
   box/trunk/bin/bbackupd/BackupDaemon.cpp
Log:
Fix redundant logging of command socket messages.

Reformat for readability.


Modified: box/trunk/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupDaemon.cpp	2008-08-07 16:35:09 UTC (rev 2226)
+++ box/trunk/bin/bbackupd/BackupDaemon.cpp	2008-08-08 22:49:42 UTC (rev 2227)
@@ -457,9 +457,6 @@
 				handles[0] = mhMessageToSendEvent;
 				handles[1] = rSocket.GetReadableEvent();
 				
-				BOX_TRACE("Received command '" << command 
-					<< "' over command socket");
-
 				DWORD result = WaitForMultipleObjects(
 					sizeof(handles)/sizeof(*handles),
 					handles, FALSE, 1000);
@@ -495,7 +492,9 @@
 				}
 				else if(result != 1)
 				{
-					BOX_ERROR("WaitForMultipleObjects returned invalid result " << result);
+					BOX_ERROR("WaitForMultipleObjects "
+						"returned invalid result " <<
+						result);
 					continue;
 				}
 
@@ -505,8 +504,8 @@
 					continue;
 				}
 
-				BOX_INFO("Received command " << command << 
-					" from client");
+				BOX_INFO("Received command '" << command << 
+					"' over command socket");
 
 				bool sendOK = false;
 				bool sendResponse = true;
@@ -553,7 +552,7 @@
 				{
 					BOX_ERROR("Received unknown command "
 						"'" << command << "' "
-						"from client");
+						"over command socket");
 					sendResponse = true;
 					sendOK = false;
 				}
@@ -561,9 +560,10 @@
 				// Send a response back?
 				if(sendResponse)
 				{
-					const char* response = sendOK ? "ok\n" : "error\n";
-					rSocket.Write(
-						response, strlen(response));
+					const char* response =
+						sendOK ? "ok\n" : "error\n";
+					rSocket.Write(response,
+						strlen(response));
 				}
 
 				if(disconnect)