Changeset 2482

Timestamp:

29/03/2009 14:08:12 (17 months ago)

Author:

chris

Message:

Add date to file logger, as requested by Kenny Millington.

Location:

box/trunk/lib/common

Files:

• BoxTime.cpp (modified) (2 diffs)
• BoxTime.h (modified) (1 diff)
• Logging.cpp (modified) (2 diffs)
• Timer.cpp (modified) (1 diff)

box/trunk/lib/common/BoxTime.cpp

@@ -54 +54 @@
 }
 
-std::string FormatTime(box_time_t time, bool showMicros)
+std::string FormatTime(box_time_t time, bool includeDate, bool showMicros)
 {
         std::ostringstream buf;
@@ -69 +69 @@
         #endif
         {
-                buf << std::setfill('0') <<
-                        std::setw(2) << tm_ptr->tm_hour << ":" << 
+                buf << std::setfill('0');
+
+                if (includeDate)
+                {
+                        buf <<  std::setw(4) << (tm_ptr->tm_year + 1900) << "-" <<
+                                std::setw(2) << (tm_ptr->tm_mon  + 1) << "-" <<
+                                std::setw(2) << (tm_ptr->tm_mday) << " ";
+                }
+
+                buf <<  std::setw(2) << tm_ptr->tm_hour << ":" << 
                         std::setw(2) << tm_ptr->tm_min  << ":" <<
                         std::setw(2) << tm_ptr->tm_sec;

box/trunk/lib/common/BoxTime.h

@@ -41 +41 @@
 }
 
-std::string FormatTime(box_time_t time, bool showMicros = false);
+std::string FormatTime(box_time_t time, bool includeDate,
+        bool showMicros = false);
 
 #endif // BOXTIME__H

box/trunk/lib/common/Logging.cpp

@@ -289 +289 @@
         if (sShowTime)
         {
-                buf << FormatTime(GetCurrentBoxTime(), sShowTimeMicros);
+                buf << FormatTime(GetCurrentBoxTime(), false, sShowTimeMicros);
                 buf << " ";
         }
@@ -450 +450 @@
 
         std::ostringstream buf;
-        buf << FormatTime(GetCurrentBoxTime(), false);
+        buf << FormatTime(GetCurrentBoxTime(), true, false);
         buf << " ";
 

box/trunk/lib/common/Timer.cpp

@@ -358 +358 @@
         {
                 BOX_TRACE(TIMER_ID "initialised for " << timeoutSecs <<
-                        " secs, to fire at " << FormatTime(mExpires, true));
+                        " secs, to fire at " << FormatTime(mExpires, false, true));
         }
         #endif