Remove Ice.Logger.DateFormat

1 files changed, 4 insertions, 29 deletions

diff --git a/cpp/src/Ice/LoggerI.cpp b/cpp/src/Ice/LoggerI.cpp
index cd83067a25f..849ff249634 100644
--- a/cpp/src/Ice/LoggerI.cpp
+++ b/cpp/src/Ice/LoggerI.cpp
@@ -17,18 +17,12 @@ using namespace IceInternal;
 
 static IceUtil::StaticMutex outputMutex = ICE_STATIC_MUTEX_INITIALIZER;
 
-Ice::LoggerI::LoggerI(const string& prefix, const string& dateFormat) :
-    _dateFormat(dateFormat)
+Ice::LoggerI::LoggerI(const string& prefix)
 {
     if(!prefix.empty())
     {
 	_prefix = prefix + ": ";
     }
-
-    if(_dateFormat == "0")
-    {
-        _dateFormat = "";
-    }
 }
 
 void
@@ -42,12 +36,7 @@ Ice::LoggerI::print(const string& message)
 void
 Ice::LoggerI::trace(const string& category, const string& message)
 {
-    string s = "[ ";
-    if(!_dateFormat.empty())
-    {
-        s += IceUtil::Time::now().toDateTime(_dateFormat) + " ";
-    }
-    s += _prefix;
+    string s = "[ " + IceUtil::Time::now().toDateTime() + " " + _prefix;
     if(!category.empty())
     {
         s += category + ": ";
@@ -69,29 +58,15 @@ Ice::LoggerI::trace(const string& category, const string& message)
 void
 Ice::LoggerI::warning(const string& message)
 {
-    string s;
-    if(!_dateFormat.empty())
-    {
-        s += IceUtil::Time::now().toDateTime(_dateFormat) + " ";
-    }
-    s += _prefix + "warning: " + message;
-
     IceUtil::StaticMutex::Lock sync(outputMutex);
 
-    cerr << s << endl;
+    cerr << IceUtil::Time::now().toDateTime() << _prefix << "warning: " << message << endl;
 }
 
 void
 Ice::LoggerI::error(const string& message)
 {
-    string s;
-    if(!_dateFormat.empty())
-    {
-        s += IceUtil::Time::now().toDateTime(_dateFormat) + " ";
-    }
-    s += _prefix + "error: " + message;
-
     IceUtil::StaticMutex::Lock sync(outputMutex);
 
-    cerr << s << endl;
+    cerr << IceUtil::Time::now().toDateTime() << _prefix << "error: " << message << endl;
 }