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

boxbackup-dev at fluffy.co.uk boxbackup-dev at fluffy.co.uk
Wed Apr 9 22:08:28 BST 2008


Author: chris
Date: 2008-04-09 21:08:28 +0000 (Wed, 09 Apr 2008)
New Revision: 2148

Modified:
   box/trunk/bin/bbackupd/BackupDaemon.cpp
Log:
Fix crash when notifying sysadmin of an invalid event code.

Disable some debug logging.


Modified: box/trunk/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupDaemon.cpp	2008-04-09 21:06:59 UTC (rev 2147)
+++ box/trunk/bin/bbackupd/BackupDaemon.cpp	2008-04-09 21:08:28 UTC (rev 2148)
@@ -2360,20 +2360,22 @@
 		0
 	};
 
-	BOX_TRACE("sizeof(sEventNames)  == " << sizeof(sEventNames));
-	BOX_TRACE("sizeof(*sEventNames) == " << sizeof(*sEventNames));
-	BOX_TRACE("NotifyEvent__MAX == " << NotifyEvent__MAX);
+	// BOX_TRACE("sizeof(sEventNames)  == " << sizeof(sEventNames));
+	// BOX_TRACE("sizeof(*sEventNames) == " << sizeof(*sEventNames));
+	// BOX_TRACE("NotifyEvent__MAX == " << NotifyEvent__MAX);
 	ASSERT((sizeof(sEventNames)/sizeof(*sEventNames)) == NotifyEvent__MAX + 1);
 
-	BOX_TRACE("BackupDaemon::NotifySysadmin() called, event = " << 
-		sEventNames[Event]);
-
 	if(Event < 0 || Event >= NotifyEvent__MAX)
 	{
+		BOX_ERROR("BackupDaemon::NotifySysadmin() called for "
+			"invalid event code " << Event);
 		THROW_EXCEPTION(BackupStoreException,
 			BadNotifySysadminEventCode);
 	}
 
+	BOX_TRACE("BackupDaemon::NotifySysadmin() called, event = " << 
+		sEventNames[Event]);
+
 	// Don't send lots of repeated messages
 	if(mNotificationsSent[Event] &&
 		Event != NotifyEvent_BackupStart &&




More information about the Boxbackup-commit mailing list