Author: ravi
Date: Sun Aug 28 19:35:04 2016
New Revision: 1758142
URL: http://svn.apache.org/viewvc?rev=1758142&view=rev
Log:
Fixing SYNAPSE-1026
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/AccessHandler.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/utils/logging/LoggingNHttpClientConnectionFactory.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/utils/logging/LoggingNHttpServerConnectionFactory.java
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/AccessHandler.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/AccessHandler.java?rev=1758142&r1=1758141&r2=1758142&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/AccessHandler.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/AccessHandler.java
Sun Aug 28 19:35:04 2016
@@ -37,4 +37,8 @@ public class AccessHandler {
public static Access getAccess() {
return access;
}
+
+ public static Log getAccessLog() {
+ return accessLog;
+ }
}
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/utils/logging/LoggingNHttpClientConnectionFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/utils/logging/LoggingNHttpClientConnectionFactory.java?rev=1758142&r1=1758141&r2=1758142&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/utils/logging/LoggingNHttpClientConnectionFactory.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/utils/logging/LoggingNHttpClientConnectionFactory.java
Sun Aug 28 19:35:04 2016
@@ -37,6 +37,7 @@ import org.apache.http.nio.reactor.IOSes
import org.apache.http.nio.reactor.SessionInputBuffer;
import org.apache.http.nio.reactor.SessionOutputBuffer;
import org.apache.http.nio.util.HeapByteBufferAllocator;
+import org.apache.synapse.transport.nhttp.AccessHandler;
import java.io.IOException;
@@ -125,11 +126,17 @@ public class LoggingNHttpClientConnectio
}
public void write(final HttpRequest request) throws IOException,
HttpException {
- if (request != null && targetHeaderLog.isDebugEnabled()) {
- targetHeaderLog.debug(">> " +
request.getRequestLine().toString());
- Header[] headers = request.getAllHeaders();
- for (Header header : headers) {
- targetHeaderLog.debug(">> " + header.toString());
+ if (request != null) {
+ if (targetHeaderLog.isDebugEnabled()) {
+ targetHeaderLog.debug(">> " +
request.getRequestLine().toString());
+ Header[] headers = request.getAllHeaders();
+ for (Header header : headers) {
+ targetHeaderLog.debug(">> " + header.toString());
+ }
+ }
+
+ if (AccessHandler.getAccessLog().isInfoEnabled()) {
+ AccessHandler.getAccess().addAccessToQueue(request);
}
}
super.write(request);
@@ -145,11 +152,17 @@ public class LoggingNHttpClientConnectio
public HttpResponse parse() throws IOException, HttpException {
HttpResponse response = super.parse();
- if (response != null && targetHeaderLog.isDebugEnabled()) {
- targetHeaderLog.debug("<< " +
response.getStatusLine().toString());
- Header[] headers = response.getAllHeaders();
- for (Header header : headers) {
- targetHeaderLog.debug("<< " + header.toString());
+ if (response != null) {
+ if (targetHeaderLog.isDebugEnabled()) {
+ targetHeaderLog.debug("<< " +
response.getStatusLine().toString());
+ Header[] headers = response.getAllHeaders();
+ for (Header header : headers) {
+ targetHeaderLog.debug("<< " + header.toString());
+ }
+ }
+
+ if (AccessHandler.getAccessLog().isInfoEnabled()) {
+ AccessHandler.getAccess().addAccessToQueue(response);
}
}
return response;
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/utils/logging/LoggingNHttpServerConnectionFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/utils/logging/LoggingNHttpServerConnectionFactory.java?rev=1758142&r1=1758141&r2=1758142&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/utils/logging/LoggingNHttpServerConnectionFactory.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/utils/logging/LoggingNHttpServerConnectionFactory.java
Sun Aug 28 19:35:04 2016
@@ -37,6 +37,7 @@ import org.apache.http.nio.reactor.IOSes
import org.apache.http.nio.reactor.SessionInputBuffer;
import org.apache.http.nio.reactor.SessionOutputBuffer;
import org.apache.http.nio.util.HeapByteBufferAllocator;
+import org.apache.synapse.transport.nhttp.AccessHandler;
import java.io.IOException;
@@ -126,11 +127,17 @@ public class LoggingNHttpServerConnectio
public HttpRequest parse() throws IOException, HttpException {
HttpRequest request = super.parse();
- if (request != null && sourceHeaderLog.isDebugEnabled()) {
- sourceHeaderLog.debug(">> " +
request.getRequestLine().toString());
- Header[] headers = request.getAllHeaders();
- for (Header header : headers) {
- sourceHeaderLog.debug(">> " + header.toString());
+ if (request != null) {
+ if (sourceHeaderLog.isDebugEnabled()) {
+ sourceHeaderLog.debug(">> " +
request.getRequestLine().toString());
+ Header[] headers = request.getAllHeaders();
+ for (Header header : headers) {
+ sourceHeaderLog.debug(">> " + header.toString());
+ }
+ }
+
+ if (AccessHandler.getAccessLog().isInfoEnabled()) {
+ AccessHandler.getAccess().addAccessToQueue(request);
}
}
return request;
@@ -144,11 +151,17 @@ public class LoggingNHttpServerConnectio
}
public void write(final HttpResponse response) throws IOException,
HttpException {
- if (response != null && sourceHeaderLog.isDebugEnabled()) {
- sourceHeaderLog.debug("<< " +
response.getStatusLine().toString());
- Header[] headers = response.getAllHeaders();
- for (Header header : headers) {
- sourceHeaderLog.debug("<< " + header.toString());
+ if (response != null) {
+ if (response != null && sourceHeaderLog.isDebugEnabled()) {
+ sourceHeaderLog.debug("<< " +
response.getStatusLine().toString());
+ Header[] headers = response.getAllHeaders();
+ for (Header header : headers) {
+ sourceHeaderLog.debug("<< " + header.toString());
+ }
+ }
+
+ if (AccessHandler.getAccessLog().isInfoEnabled()) {
+ AccessHandler.getAccess().addAccessToQueue(response);
}
}
super.write(response);
