Imported Upstream version 0.3.2

[anytun.git] / src / logTargets.cpp

diff --git a/src/logTargets.cpp b/src/logTargets.cpp
index 9a07309..5b19954 100644 (file)
--- a/src/logTargets.cpp
+++ b/src/logTargets.cpp
@@ -11,14 +11,15 @@
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2008 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, 
  *                          Christian Pointner <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
  *
  *  Anytun is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
  *
  *  Anytun is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -44,6 +45,8 @@
 #include <strsafe.h>
 #endif
 
+#include <boost/date_time/posix_time/posix_time.hpp>
+
 LogTarget::LogTarget() : opened(false), enabled(false), max_prio(Log::PRIO_NOTICE)
 {
 }
@@ -326,7 +329,8 @@ void LogTargetFile::log(std::string msg, int prio)
   if(!opened)
     return;
 
-  logfile << Log::prioToString(prio) << ": " << msg << std::endl;
+  std::string timestamp = boost::posix_time::to_simple_string(boost::posix_time::second_clock::local_time());
+  logfile << timestamp << " " << Log::prioToString(prio) << ": " << msg << std::endl;
 }
 
 LogTargetFile& LogTargetFile::setLogFilename(std::string l)
@@ -366,7 +370,8 @@ void LogTargetStdout::log(std::string msg, int prio)
   if(!opened)
     return;
 
-  stream << "LOG-" << Log::prioToString(prio) << ": " << msg << std::endl;
+  std::string timestamp = boost::posix_time::to_simple_string(boost::posix_time::second_clock::local_time());
+  stream << timestamp << " " << Log::prioToString(prio) << ": " << msg << std::endl;
 }
 #endif