Merge pull request #2425 from sajinieKavindya/master

Update warn log for better clarity

Author: sajinieKavindya

modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java

@@ -226,13 +226,19 @@ public long evaluateDynamicEndpointTimeout(MessageContext synCtx) {
             if (stringValue != null) {
                 timeoutMilliSeconds = Long.parseLong(stringValue.trim());
             } else {
-                log.warn("Error while evaluating dynamic endpoint timeout expression." +
-                        "Synapse global timeout is taken as effective timeout.");
+                log.warn("Error while evaluating dynamic endpoint timeout expression: "
+                        + dynamicTimeout.getExpression()
+                        + (this.leafEndpoint != null && this.leafEndpoint.getName() != null ? " in endpoint: '"
+                        + this.leafEndpoint.getName() + "'" : " defined in an anonymous endpoint")
+                        + ". Using the Synapse global timeout: " + effectiveTimeout + " as the effective timeout.");
                 timeoutMilliSeconds = effectiveTimeout;
             }
         } catch (NumberFormatException e) {
-            log.warn("Error while evaluating dynamic endpoint timeout expression." +
-                    "Synapse global timeout is taken as effective timeout.");
+            log.warn("Error while evaluating dynamic endpoint timeout expression: " + dynamicTimeout.getExpression()
+                    + (this.leafEndpoint != null && this.leafEndpoint.getName() != null ? " in endpoint: '"
+                    + this.leafEndpoint.getName() + "'" : " defined in an anonymous endpoint")
+                    + ". Using the Synapse global timeout: " + effectiveTimeout + " as the effective timeout. "
+                    + "Error: " + e.getMessage());
             timeoutMilliSeconds = effectiveTimeout;
         }
         if (timeoutMilliSeconds > effectiveTimeout) {