Author: markt
Date: Wed Aug 28 14:02:50 2013
New Revision: 1518210
URL: http://svn.apache.org/r1518210
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55494
Reduce log level of exception messages that are logged for re-tries. Make clear
in the message that a retry is taking place.
Modified:
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1518210&r1=1518209&r2=1518210&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Wed Aug 28
14:02:50 2013
@@ -1028,7 +1028,7 @@ public class JNDIRealm extends RealmBase
with broken SSL
*/
// log the exception so we know it's there.
- containerLog.warn(sm.getString("jndiRealm.exception"), e);
+ containerLog.info(sm.getString("jndiRealm.exception.retry"),
e);
// close the connection so we know it will be reopened.
if (context != null)
@@ -1043,7 +1043,7 @@ public class JNDIRealm extends RealmBase
} catch (CommunicationException e) {
// log the exception so we know it's there.
- containerLog.warn(sm.getString("jndiRealm.exception"), e);
+ containerLog.info(sm.getString("jndiRealm.exception.retry"),
e);
// close the connection so we know it will be reopened.
if (context != null)
@@ -1058,7 +1058,7 @@ public class JNDIRealm extends RealmBase
} catch (ServiceUnavailableException e) {
// log the exception so we know it's there.
- containerLog.warn(sm.getString("jndiRealm.exception"), e);
+ containerLog.info(sm.getString("jndiRealm.exception.retry"),
e);
// close the connection so we know it will be reopened.
if (context != null)
@@ -1987,7 +1987,7 @@ public class JNDIRealm extends RealmBase
} catch (CommunicationException e) {
// log the exception so we know it's there.
- containerLog.warn(sm.getString("jndiRealm.exception"), e);
+ containerLog.info(sm.getString("jndiRealm.exception.retry"),
e);
// close the connection so we know it will be reopened.
if (context != null)
@@ -2002,7 +2002,7 @@ public class JNDIRealm extends RealmBase
} catch (ServiceUnavailableException e) {
// log the exception so we know it's there.
- containerLog.warn(sm.getString("jndiRealm.exception"), e);
+ containerLog.info(sm.getString("jndiRealm.exception.retry"),
e);
// close the connection so we know it will be reopened.
if (context != null)
@@ -2122,7 +2122,7 @@ public class JNDIRealm extends RealmBase
connectionAttempt = 1;
// log the first exception.
- containerLog.warn(sm.getString("jndiRealm.exception"), e);
+ containerLog.info(sm.getString("jndiRealm.exception.retry"), e);
// Try connecting to the alternate url.
context = new InitialDirContext(getDirectoryContextEnvironment());
Modified: tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties?rev=1518210&r1=1518209&r2=1518210&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties Wed Aug
28 14:02:50 2013
@@ -44,6 +44,7 @@ jndiRealm.authenticateFailure=Username {
jndiRealm.authenticateSuccess=Username {0} successfully authenticated
jndiRealm.close=Exception closing directory server connection
jndiRealm.exception=Exception performing authentication
+jndiRealm.exception.retry=Exception performing authentication. Retrying...
jndiRealm.open=Exception opening directory server connection
memoryRealm.authenticateFailure=Username {0} NOT successfully authenticated
memoryRealm.authenticateSuccess=Username {0} successfully authenticated
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
