[Box Backup-commit] COMMIT r3133 - box/trunk/lib/common

[subversion at boxbackup.org]

Author: chris
Date: 2012-11-07 00:33:38 +0000 (Wed, 07 Nov 2012)
New Revision: 3133

Modified:
   box/trunk/lib/common/Timer.cpp
Log:
Fix incorrect logging of timer assignment, and format expiry time as a human time.


Modified: box/trunk/lib/common/Timer.cpp
===================================================================
--- box/trunk/lib/common/Timer.cpp	2012-11-07 00:24:37 UTC (rev 3132)
+++ box/trunk/lib/common/Timer.cpp	2012-11-07 00:33:38 UTC (rev 3133)
@@ -482,13 +482,13 @@
 void Timer::LogAssignment(const Timer &From)
 {
 	#ifndef BOX_RELEASE_BUILD
-	if (mExpired)
+	if (From.mExpired)
 	{
 		BOX_TRACE(TIMER_ID "initialised from timer " << 
 			TIMER_ID_OF(From) << ", already expired, "
 			"will not fire");
 	}
-	else if (mExpires == 0)
+	else if (From.mExpires == 0)
 	{
 		BOX_TRACE(TIMER_ID "initialised from timer " <<
 			TIMER_ID_OF(From) << ", no expiry, "
@@ -497,8 +497,8 @@
 	else
 	{
 		BOX_TRACE(TIMER_ID "initialised from timer " <<
-			TIMER_ID_OF(From) << ", to fire after " <<
-			BOX_FORMAT_MICROSECONDS(From.mExpires));
+			TIMER_ID_OF(From) << ", to fire at " <<
+			FormatTime(From.mExpires, false, true));
 	}
 	#endif
 }