Changeset 2227

Timestamp:

08/08/2008 23:49:42 (5 months ago)

Author:

chris

Message:

Fix redundant logging of command socket messages.

Reformat for readability.

Files:

• box/trunk/bin/bbackupd/BackupDaemon.cpp (modified) (5 diffs)

box/trunk/bin/bbackupd/BackupDaemon.cpp

@@ -458 +458 @@
                                 handles[1] = rSocket.GetReadableEvent();
                                 
-                                BOX_TRACE("Received command '" << command 
-                                        << "' over command socket");
-
                                 DWORD result = WaitForMultipleObjects(
                                         sizeof(handles)/sizeof(*handles),
@@ -496 +493 @@
                                 else if(result != 1)
                                 {
-                                        BOX_ERROR("WaitForMultipleObjects returned invalid result " << result);
+                                        BOX_ERROR("WaitForMultipleObjects "
+                                                "returned invalid result " <<
+                                                result);
                                         continue;
                                 }
@@ -506 +505 @@
                                 }
 
-                                BOX_INFO("Received command " << command << 
-                                        " from client");
+                                BOX_INFO("Received command '" << command << 
+                                        "' over command socket");
 
                                 bool sendOK = false;
@@ -554 +553 @@
                                         BOX_ERROR("Received unknown command "
                                                 "'" << command << "' "
-                                                "from client");
+                                                "over command socket");
                                         sendResponse = true;
                                         sendOK = false;
@@ -562 +561 @@
                                 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));
                                 }