diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/LoggerI.java | 28 | ||||
| -rw-r--r-- | java/src/IceInternal/Instance.java | 3 | ||||
| -rw-r--r-- | java/src/IceInternal/PropertyNames.java | 5 |
3 files changed, 25 insertions, 11 deletions
diff --git a/java/src/Ice/LoggerI.java b/java/src/Ice/LoggerI.java index 2aded8f18bc..414bc7cbe50 100644 --- a/java/src/Ice/LoggerI.java +++ b/java/src/Ice/LoggerI.java @@ -12,14 +12,17 @@ package Ice; public final class LoggerI extends LocalObjectImpl implements Logger { public - LoggerI(String prefix) + LoggerI(String prefix, String dateFormat) { if(prefix.length() > 0) { _prefix = prefix + ": "; } - _date = new java.text.SimpleDateFormat("MM/dd/yy HH:mm:ss:SSS"); + if(!dateFormat.equals("0")) + { + _date = new java.text.SimpleDateFormat(dateFormat); + } } public void @@ -37,8 +40,11 @@ public final class LoggerI extends LocalObjectImpl implements Logger synchronized(_globalMutex) { StringBuffer s = new StringBuffer("[ "); - s.append(_date.format(new java.util.Date())); - s.append(' '); + if(_date != null) + { + s.append(_date.format(new java.util.Date())); + s.append(' '); + } s.append(_prefix); s.append(category); s.append(": "); @@ -60,8 +66,11 @@ public final class LoggerI extends LocalObjectImpl implements Logger synchronized(_globalMutex) { StringBuffer s = new StringBuffer(); - s.append(_date.format(new java.util.Date())); - s.append(' '); + if(_date != null) + { + s.append(_date.format(new java.util.Date())); + s.append(' '); + } s.append(_prefix); s.append("warning: "); s.append(message); @@ -75,8 +84,11 @@ public final class LoggerI extends LocalObjectImpl implements Logger synchronized(_globalMutex) { StringBuffer s = new StringBuffer(); - s.append(_date.format(new java.util.Date())); - s.append(' '); + if(_date != null) + { + s.append(_date.format(new java.util.Date())); + s.append(' '); + } s.append(_prefix); s.append("error: "); s.append(message); diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java index a2a82c6d21b..20d199eb0f4 100644 --- a/java/src/IceInternal/Instance.java +++ b/java/src/IceInternal/Instance.java @@ -368,7 +368,8 @@ public final class Instance } else { - _initData.logger = new Ice.LoggerI(_initData.properties.getProperty("Ice.ProgramName")); + _initData.logger = new Ice.LoggerI(_initData.properties.getProperty("Ice.ProgramName"), + _initData.properties.getPropertyWithDefault("Ice.Logger.DateFormat", "yy/MM/dd HH:mm:ss:SSS")); } } diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java index fc4d6aa214a..73d310988ab 100644 --- a/java/src/IceInternal/PropertyNames.java +++ b/java/src/IceInternal/PropertyNames.java @@ -7,7 +7,7 @@ // // ********************************************************************** -// Generated by makeprops.py from file `../config/PropertyNames.def', Mon Dec 18 13:40:21 2006 +// Generated by makeprops.py from file `./config/PropertyNames.def', Tue Dec 19 14:18:06 2006 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -19,6 +19,7 @@ public final class PropertyNames { "^Ice\\.ACM\\.Client$", "^Ice\\.ACM\\.Server$", + "^Ice\\.AllowableEndpoints$", "^Ice\\.ChangeUser$", "^Ice\\.Compression\\.Level$", "^Ice\\.Config$", @@ -47,6 +48,7 @@ public final class PropertyNames "^Ice\\.GC\\.Interval$", "^Ice\\.ImplicitContext$", "^Ice\\.InitPlugins$", + "^Ice\\.Logger\\.DateFormat$", "^Ice\\.LoggerPlugin$", "^Ice\\.MessageSizeMax$", "^Ice\\.MonitorConnections$", @@ -103,7 +105,6 @@ public final class PropertyNames "^Ice\\.Warn\\.Datagrams$", "^Ice\\.Warn\\.Dispatch$", "^Ice\\.Warn\\.Endpoints$", - "^Ice\\.AllowableEndpoints$", null }; |