You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by hi...@apache.org on 2011/12/21 07:09:35 UTC
svn commit: r1221624 - in
/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp:
AccessConstants.java LoggingNHttpClientConnection.java
LoggingNHttpServerConnection.java LoggingUtils.java
Author: hiranya
Date: Wed Dec 21 06:09:35 2011
New Revision: 1221624
URL: http://svn.apache.org/viewvc?rev=1221624&view=rev
Log:
Patch for SYNAPSE-781, Fixed some test failures and updated the log file location
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/AccessConstants.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/LoggingNHttpClientConnection.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/LoggingNHttpServerConnection.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/LoggingUtils.java
Modified: synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/AccessConstants.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/AccessConstants.java?rev=1221624&r1=1221623&r2=1221624&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/AccessConstants.java (original)
+++ synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/AccessConstants.java Wed Dec 21 06:09:35 2011
@@ -39,7 +39,7 @@ public class AccessConstants {
/**
* The directory in which log files are created.
*/
- public static String DIRECTORY = "repository/logs";
+ public static String DIRECTORY = "logs";
/**
* Gives the format of the date to be appended to the name of the access log file.
Modified: synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/LoggingNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/LoggingNHttpClientConnection.java?rev=1221624&r1=1221623&r2=1221624&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/LoggingNHttpClientConnection.java (original)
+++ synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/LoggingNHttpClientConnection.java Wed Dec 21 06:09:35 2011
@@ -47,6 +47,7 @@ public class LoggingNHttpClientConnectio
private final Log iolog;
private final Log headerlog;
private final Log wirelog;
+ private final Log accesslog;
private final String id;
public LoggingNHttpClientConnection(
@@ -59,6 +60,7 @@ public class LoggingNHttpClientConnectio
this.iolog = LogFactory.getLog(session.getClass());
this.headerlog = LogFactory.getLog(LoggingUtils.HEADER_LOG_ID);
this.wirelog = LogFactory.getLog(LoggingUtils.WIRE_LOG_ID);
+ this.accesslog = LogFactory.getLog(LoggingUtils.ACCESS_LOG_ID);
this.id = "http-outgoing-" + COUNT.incrementAndGet();
if (this.iolog.isDebugEnabled() || this.wirelog.isDebugEnabled()) {
this.session = new LoggingIOSession(session, this.id, this.iolog, this.wirelog);
@@ -148,6 +150,9 @@ public class LoggingNHttpClientConnectio
headerlog.debug(id + " >> " + headers[i].toString());
}
}
+ if (message != null && accesslog.isInfoEnabled()) {
+ AccessHandler.getAccess().addAccessToQueue(message);
+ }
this.writer.write(message);
}
@@ -179,6 +184,9 @@ public class LoggingNHttpClientConnectio
headerlog.debug(id + " << " + headers[i].toString());
}
}
+ if (message != null && accesslog.isInfoEnabled()) {
+ AccessHandler.getAccess().addAccessToQueue(message);
+ }
return message;
}
Modified: synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/LoggingNHttpServerConnection.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/LoggingNHttpServerConnection.java?rev=1221624&r1=1221623&r2=1221624&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/LoggingNHttpServerConnection.java (original)
+++ synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/LoggingNHttpServerConnection.java Wed Dec 21 06:09:35 2011
@@ -46,6 +46,7 @@ public class LoggingNHttpServerConnectio
private final Log log;
private final Log iolog;
private final Log headerlog;
+ private final Log accesslog;
private final Log wirelog;
private final String id;
@@ -59,6 +60,7 @@ public class LoggingNHttpServerConnectio
this.iolog = LogFactory.getLog(session.getClass());
this.headerlog = LogFactory.getLog(LoggingUtils.HEADER_LOG_ID);
this.wirelog = LogFactory.getLog(LoggingUtils.WIRE_LOG_ID);
+ this.accesslog = LogFactory.getLog(LoggingUtils.ACCESS_LOG_ID);
this.id = "http-incoming-" + COUNT.incrementAndGet();
if (this.iolog.isDebugEnabled() || this.wirelog.isDebugEnabled()) {
this.session = new LoggingIOSession(session, this.id, this.iolog, this.wirelog);
@@ -148,6 +150,11 @@ public class LoggingNHttpServerConnectio
headerlog.debug(id + " << " + headers[i].toString());
}
}
+
+ if (message != null && accesslog.isInfoEnabled()) {
+ AccessHandler.getAccess().addAccessToQueue(message);
+ }
+
this.writer.write(message);
}
@@ -179,6 +186,10 @@ public class LoggingNHttpServerConnectio
headerlog.debug(id + " >> " + headers[i].toString());
}
}
+ if (message != null && accesslog.isInfoEnabled()) {
+ AccessHandler.getAccess().addAccessToQueue(message);
+ }
+
return message;
}
Modified: synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/LoggingUtils.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/LoggingUtils.java?rev=1221624&r1=1221623&r2=1221624&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/LoggingUtils.java (original)
+++ synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/LoggingUtils.java Wed Dec 21 06:09:35 2011
@@ -34,7 +34,8 @@ import org.apache.http.params.HttpParams
class LoggingUtils {
public final static String HEADER_LOG_ID = "org.apache.synapse.transport.nhttp.headers";
- public final static String WIRE_LOG_ID = "org.apache.synapse.transport.nhttp.wire";
+ public final static String WIRE_LOG_ID = "org.apache.synapse.transport.nhttp.wire";
+ public final static String ACCESS_LOG_ID = "org.apache.synapse.transport.nhttp.access";
public static NHttpClientHandler decorate(NHttpClientHandler handler) {
Log log = LogFactory.getLog(handler.getClass());