You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2014/08/03 18:27:33 UTC

svn commit: r1615420 - in /jackrabbit/oak/branches/1.0: ./ oak-doc/ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java

Author: chetanm
Date: Sun Aug  3 16:27:32 2014
New Revision: 1615420

URL: http://svn.apache.org/r1615420
Log:
OAK-2011 - Log and read and write operations to different loggers

Merging 1615417,1615418

Modified:
    jackrabbit/oak/branches/1.0/   (props changed)
    jackrabbit/oak/branches/1.0/oak-doc/   (props changed)
    jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java

Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
  Merged /jackrabbit/oak/trunk:r1615417-1615418

Propchange: jackrabbit/oak/branches/1.0/oak-doc/
------------------------------------------------------------------------------
  Merged /jackrabbit/oak/trunk/oak-doc:r1615417-1615418

Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java?rev=1615420&r1=1615419&r2=1615420&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java Sun Aug  3 16:27:32 2014
@@ -69,7 +69,8 @@ import static org.apache.jackrabbit.oak.
  */
 public class SessionDelegate {
     static final Logger log = LoggerFactory.getLogger(SessionDelegate.class);
-    static final Logger operationLogger = LoggerFactory.getLogger("org.apache.jackrabbit.oak.jcr.operations");
+    static final Logger readOperationLogger = LoggerFactory.getLogger("org.apache.jackrabbit.oak.jcr.operations.reads");
+    static final Logger writeOperationLogger = LoggerFactory.getLogger("org.apache.jackrabbit.oak.jcr.operations.writes");
 
     private final ContentSession contentSession;
     private final SecurityProvider securityProvider;
@@ -643,10 +644,11 @@ public class SessionDelegate {
     //------------------------------------------------------------< internal >---
 
     private static <T> void logOperationDetails(ContentSession session, SessionOperation<T> ops) {
-        if (operationLogger.isDebugEnabled()){
+        if (readOperationLogger.isTraceEnabled()
+                || writeOperationLogger.isTraceEnabled()) {
             Marker sessionMarker = MarkerFactory.getMarker(session.toString());
-            String sessionId = session.toString();
-            operationLogger.debug(sessionMarker, String.format("[%s] %s", sessionId, ops));
+            Logger log = ops.isUpdate() ? writeOperationLogger : readOperationLogger;
+            log.trace(sessionMarker, "[{}] {}", session, ops);
         }
     }