Merge pull request wso2#2118 from arunans23/support-2.1.7-wso2v183.x-…

…full [3.2.0] Generalize passthrough transport logs for APIM/EI
shilmyhasan · Jun 7, 2023 · f119b10 · f119b10
2 parents 42d544b + d9548f2
commit f119b10
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...nsports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java b/...nsports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java
@@ -668,7 +668,7 @@ public void closed(NHttpServerConnection conn) {
             log.warn("STATE_DESCRIPTION = Connection closed while server accepting request headers but prior to "
                     + "finish reading the request body, INTERNAL_STATE = " + state + ", DIRECTION = " + logDetails
                     .get("direction") + ", "
-                    + "CAUSE_OF_ERROR = Connection between EI and the Client has been closed, HTTP_URL = " + logDetails
+                    + "CAUSE_OF_ERROR = Connection between WSO2 Server and the Client has been closed, HTTP_URL = " + logDetails
                     .get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method") + ", CLIENT_ADDRESS = "
                     + getClientConnectionInfo(conn)
                     + ", CORRELATION_ID = " + conn.getContext().getAttribute(CorrelationConstants.CORRELATION_ID)
@@ -682,7 +682,7 @@ public void closed(NHttpServerConnection conn) {
             informWriterError(conn);
             log.warn("STATE_DESCRIPTION = Connection closed while server writing the response headers or body, "
                     + "INTERNAL_STATE = " + state + ", DIRECTION = " + logDetails.get("direction") + ", "
-                    + "CAUSE_OF_ERROR = Connection between EI and the Client has been closed, HTTP_URL = " + logDetails
+                    + "CAUSE_OF_ERROR = Connection between WSO2 Server and the Client has been closed, HTTP_URL = " + logDetails
                     .get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method") + ", CLIENT_ADDRESS = "
                     + getClientConnectionInfo(conn)
                     + ", CORRELATION_ID = " + conn.getContext().getAttribute(CorrelationConstants.CORRELATION_ID)
@@ -695,7 +695,7 @@ public void closed(NHttpServerConnection conn) {
             informWriterError(conn);
             log.warn("STATE_DESCRIPTION = Connection closed after server accepting the request headers and the "
                     + "request body, INTERNAL_STATE = " + state + ", DIRECTION = " + logDetails.get("direction") + ", "
-                    + "CAUSE_OF_ERROR = Connection between EI and the Client has been closed, HTTP_URL = " + logDetails
+                    + "CAUSE_OF_ERROR = Connection between WSO2 Server and the Client has been closed, HTTP_URL = " + logDetails
                     .get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method") + ", CLIENT_ADDRESS = "
                     + getClientConnectionInfo(conn)
                     + ", CORRELATION_ID = " + conn.getContext().getAttribute(CorrelationConstants.CORRELATION_ID)

diff --git a/...nsports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java b/...nsports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java
@@ -804,7 +804,7 @@ public void timeout(NHttpClientConnection conn) {
                 log.warn("ERROR_CODE = " + ErrorCodes.CONNECTION_TIMEOUT + ", STATE_DESCRIPTION = Socket Timeout "
                         + "occurred " + logDetails.get("state_description") + ", INTERNAL_STATE = " + state
                         + ", DIRECTION = " + logDetails.get("direction") + ", "
-                        + "CAUSE_OF_ERROR = Connection between the EI and the BackEnd timeouts, TARGET_HOST = "
+                        + "CAUSE_OF_ERROR = Connection between the WSO2 Server and the BackEnd timeouts, TARGET_HOST = "
                         + logDetails.get("host") + ", TARGET_PORT = " + logDetails.get("port") + ", TARGET_CONTEXT = "
                         + logDetails.get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method")
                         + ", TRIGGER_TYPE = " + logDetails.get("trigger_type") + ", TRIGGER_NAME = " + logDetails
@@ -819,7 +819,7 @@ public void timeout(NHttpClientConnection conn) {
                 log.warn("ERROR_CODE = " + ErrorCodes.CONNECTION_TIMEOUT + ", STATE_DESCRIPTION = Socket Timeout "
                         + "occurred " + logDetails.get("state_description") + ", INTERNAL_STATE = " + state
                         + ", DIRECTION = " + logDetails.get("direction") + ", "
-                        + "CAUSE_OF_ERROR = Connection between the EI and the BackEnd timeouts, TARGET_HOST = "
+                        + "CAUSE_OF_ERROR = Connection between the WSO2 Server and the BackEnd timeouts, TARGET_HOST = "
                         + logDetails.get("host") + ", TARGET_PORT = " + logDetails.get("port") + ", TARGET_CONTEXT = "
                         + logDetails.get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method")
                         + ", TRIGGER_TYPE = " + logDetails.get("trigger_type") + ", TRIGGER_NAME = " + logDetails
@@ -832,7 +832,7 @@ public void timeout(NHttpClientConnection conn) {
                 log.warn("ERROR_CODE = " + ErrorCodes.CONNECTION_TIMEOUT + ", STATE_DESCRIPTION = Socket Timeout "
                         + "occurred " + logDetails.get("state_description") + ", INTERNAL_STATE = " + state
                         + ", DIRECTION = " + logDetails.get("direction") + ", "
-                        + "CAUSE_OF_ERROR = Connection between the EI and the BackEnd timeouts, TARGET_HOST = "
+                        + "CAUSE_OF_ERROR = Connection between the WSO2 Server and the BackEnd timeouts, TARGET_HOST = "
                         + logDetails.get("host") + ", TARGET_PORT = " + logDetails.get("port") + ", TARGET_CONTEXT = "
                         + logDetails.get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method")
                         + ", TRIGGER_TYPE = " + logDetails.get("trigger_type") + ", TRIGGER_NAME = " + logDetails