svn commit: r946815 - in /hadoop/common/trunk: CHANGES.txt src/java/org/apache/hadoop/ipc/Server.java src/test/core/org/apache/hadoop/ipc/MiniRPCBenchmark.java

[boryas]

Author: boryas
Date: Thu May 20 23:11:08 2010
New Revision: 946815

URL: http://svn.apache.org/viewvc?rev=946815&view=rev
Log:
HADOOP-6781. security audit log shouldn't have exception in it.

Modified:
    hadoop/common/trunk/CHANGES.txt
    hadoop/common/trunk/src/java/org/apache/hadoop/ipc/Server.java
    
hadoop/common/trunk/src/test/core/org/apache/hadoop/ipc/MiniRPCBenchmark.java

Modified: hadoop/common/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=946815&r1=946814&r2=946815&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Thu May 20 23:11:08 2010
@@ -23,6 +23,8 @@ Trunk (unreleased changes)
 
   BUG FIXES
 
+    HADOOP-6781. security audit log shouldn't have exception in it.
+
     HADOOP-6612.  Protocols RefreshUserToGroupMappingsProtocol and 
     RefreshAuthorizationPolicyProtocol will fail with security enabled (boryas)
 

Modified: hadoop/common/trunk/src/java/org/apache/hadoop/ipc/Server.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/ipc/Server.java?rev=946815&r1=946814&r2=946815&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/ipc/Server.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/ipc/Server.java Thu May 20 
23:11:08 2010
@@ -111,7 +111,7 @@ public abstract class Server {
   static int INITIAL_RESP_BUF_SIZE = 10240;
 
   public static final Log LOG = LogFactory.getLog(Server.class);
-  public static final Log auditLOG = 
+  public static final Log AUDITLOG = 
     LogFactory.getLog("SecurityLogger."+Server.class.getName());
   private static final String AUTH_FAILED_FOR = "Auth failed for ";
   private static final String AUTH_SUCCESSFULL_FOR = "Auth successfull for ";
@@ -995,7 +995,7 @@ public abstract class Server {
           rpcMetrics.authenticationFailures.inc();
           String clientIP = this.toString();
           // attempting user could be null
-          auditLOG.warn(AUTH_FAILED_FOR + clientIP + ":" + attemptingUser, e);
+          AUDITLOG.warn(AUTH_FAILED_FOR + clientIP + ":" + attemptingUser);
           throw e;
         }
         if (replyToken != null) {
@@ -1013,7 +1013,7 @@ public abstract class Server {
           user = getAuthorizedUgi(saslServer.getAuthorizationID());
           LOG.info("SASL server successfully authenticated client: " + user);
           rpcMetrics.authenticationSuccesses.inc();
-          auditLOG.info(AUTH_SUCCESSFULL_FOR + user);
+          AUDITLOG.info(AUTH_SUCCESSFULL_FOR + user);
           saslContextEstablished = true;
         }
       } else {

Modified: 
hadoop/common/trunk/src/test/core/org/apache/hadoop/ipc/MiniRPCBenchmark.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/src/test/core/org/apache/hadoop/ipc/MiniRPCBenchmark.java?rev=946815&r1=946814&r2=946815&view=diff
==============================================================================
--- 
hadoop/common/trunk/src/test/core/org/apache/hadoop/ipc/MiniRPCBenchmark.java 
(original)
+++ 
hadoop/common/trunk/src/test/core/org/apache/hadoop/ipc/MiniRPCBenchmark.java 
Thu May 20 23:11:08 2010
@@ -242,7 +242,7 @@ public class MiniRPCBenchmark {
 
   static void setLoggingLevel(Level level) {
     LogManager.getLogger(Server.class.getName()).setLevel(level);
-    ((Log4JLogger)Server.auditLOG).getLogger().setLevel(level);
+    ((Log4JLogger)Server.AUDITLOG).getLogger().setLevel(level);
     LogManager.getLogger(Client.class.getName()).setLevel(level);
   }