[Box Backup-commit] COMMIT r1168 - box/chris/merge/bin/bbstored

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-11-13 20:01:39 +0000 (Mon, 13 Nov 2006)
New Revision: 1168

Modified:
   box/chris/merge/bin/bbstored/BackupStoreDaemon.cpp
Log:
Properly revert [1096] (refs #3)


Modified: box/chris/merge/bin/bbstored/BackupStoreDaemon.cpp
===================================================================
--- box/chris/merge/bin/bbstored/BackupStoreDaemon.cpp	2006-11-13 19:52:05 UTC (rev 1167)
+++ box/chris/merge/bin/bbstored/BackupStoreDaemon.cpp	2006-11-13 20:01:39 UTC (rev 1168)
@@ -241,49 +241,17 @@
 	}
 }
 
+
 // --------------------------------------------------------------------------
 //
 // Function
 //		Name:    BackupStoreDaemon::Connection(SocketStreamTLS &)
-//		Purpose: Handles a connection, by catching exceptions and
-//			 delegating to Connection2
+//		Purpose: Handles a connection
 //		Created: 2003/08/20
 //
 // --------------------------------------------------------------------------
 void BackupStoreDaemon::Connection(SocketStreamTLS &rStream)
 {
-	try
-	{
-		Connection2(rStream);
-	}
-	catch(BoxException &e)
-	{
-		::syslog(LOG_ERR, "%s: disconnecting due to "
-			"exception %s (%d/%d)", DaemonName(), 
-			e.what(), e.GetType(), e.GetSubType());
-	}
-	catch(std::exception &e)
-	{
-		::syslog(LOG_ERR, "%s: disconnecting due to "
-			"exception %s", DaemonName(), e.what());
-	}
-	catch(...)
-	{
-		::syslog(LOG_ERR, "%s: disconnecting due to "
-			"unknown exception", DaemonName());
-	}
-}
-	
-// --------------------------------------------------------------------------
-//
-// Function
-//		Name:    BackupStoreDaemon::Connection2(SocketStreamTLS &)
-//		Purpose: Handles a connection from bbackupd
-//		Created: 2006/11/12
-//
-// --------------------------------------------------------------------------
-void BackupStoreDaemon::Connection2(SocketStreamTLS &rStream)
-{
 	// Get the common name from the certificate
 	std::string clientCommonName(rStream.GetPeerCommonName());