ggolden 2002/09/30 11:46:22
Modified: src/java/org/apache/jetspeed/modules/actions JLoginUser.java
Log:
cleaned up logging
Revision Changes Path
1.31 +6 -5
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java
Index: JLoginUser.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- JLoginUser.java 16 Sep 2002 17:57:14 -0000 1.30
+++ JLoginUser.java 30 Sep 2002 18:46:21 -0000 1.31
@@ -124,7 +124,8 @@
{
data.setScreenTemplate("LoginHelp");
data.setMessage(Localization.getString("JLOGINUSER_PASSWORDREMINDER_INVALIDUSER"));
-
Log.debug(Localization.getString("JLOGINUSER_PASSWORDREMINDER_INVALIDUSER"));
+ if (Log.getLogger().isDebugEnabled())
+
Log.debug(Localization.getString("JLOGINUSER_PASSWORDREMINDER_INVALIDUSER"));
return;
}
@@ -177,7 +178,7 @@
String errorTitle =
Localization.getString("JLOGINUSER_PASSWORDREMINDER_ERROR") ;
String errorMessage = errorTitle + e.toString();
- Log.error( errorMessage, e );
+ Log.warn( errorMessage, e );
data.setMessage ( errorMessage );
}
}
@@ -211,7 +212,7 @@
if (user == null)
{
- Log.error("JLogin User: Unexpected condition : user is NULL");
+ Log.warn("JLogin User: Unexpected condition : user is NULL");
return;
}
String confirm_value = user.getConfirmed();
@@ -260,12 +261,12 @@
if (e instanceof FailedLoginException)
{
- Log.info("JLoginUser: Credential Failure on login for user: " +
username, e);
+ Log.info("JLoginUser: Credential Failure on login for user: " +
username);
data.setMessage(Localization.getString("PASSWORDFORM_FAILED_MSG"));
}
else if (e instanceof AccountExpiredException)
{
- Log.info("JLoginUser: Account Expired ", e);
+ Log.info("JLoginUser: Account Expired for user " + username);
}
else if (e instanceof CredentialExpiredException)
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>