[Box Backup-commit] COMMIT r1955 - box/chris/general/lib/server
boxbackup-dev at fluffy.co.uk
boxbackup-dev at fluffy.co.uk
Sat Dec 8 22:00:03 GMT 2007
Author: chris
Date: 2007-12-08 22:00:03 +0000 (Sat, 08 Dec 2007)
New Revision: 1955
Modified:
box/chris/general/lib/server/ServerStream.h
Log:
Receiving a connection is not an error. (merges [1912] plus local change)
Modified: box/chris/general/lib/server/ServerStream.h
===================================================================
--- box/chris/general/lib/server/ServerStream.h 2007-12-08 21:52:45 UTC (rev 1954)
+++ box/chris/general/lib/server/ServerStream.h 2007-12-08 22:00:03 UTC (rev 1955)
@@ -227,13 +227,17 @@
if(psocket)
{
- // Get the incomming connection (with zero wait time)
+ // Get the incoming connection
+ // (with zero wait time)
std::string logMessage;
std::auto_ptr<StreamType> connection(psocket->Accept(0, &logMessage));
// Was there one (there should be...)
if(connection.get())
{
+ // Log who connected
+ BOX_NOTICE(logMessage);
+
// Since this is a template parameter, the if() will be optimised out by the compiler
#ifndef WIN32 // no fork on Win32
if(ForkToHandleRequests && !IsSingleProcess())
@@ -270,9 +274,6 @@
// parent daemon process
break;
}
-
- // Log it
- BOX_WARNING("Error message from child process " << pid << ": " << logMessage);
}
else
{
More information about the Boxbackup-commit
mailing list