#371 Add remote IP address to REquestDispatcher log

Igor Polevoy · Igor Polevoy · commit 5cf45c1eeebc · 2017-10-31T08:25:14.000-05:00
diff --git a/activeweb/src/main/java/org/javalite/activeweb/RequestDispatcher.java b/activeweb/src/main/java/org/javalite/activeweb/RequestDispatcher.java
@@ -146,7 +146,7 @@ private void initAppConfig(String configClassName, AppContext context, boolean f
                 throw new InitException(e);
             }else{
                 logger.warn("Failed to create and init a new instance of class: " + configClassName
-                        + ", proceeding without it.", e);
+                        + ", proceeding without it.");
             }
         }
     }
@@ -322,6 +322,7 @@ private void logDone(Throwable throwable) {
                 + "\",\"url\":\"" + url
                 + (redirectTarget != null ? "\",\"redirect_target\":\"" + redirectTarget: "")
                 + (throwable != null ? "\",\"error\":\"" + JsonHelper.sanitize(throwable.getMessage() != null ? throwable.getMessage() : throwable.toString()) : "")
+                + "\",\"remote_ip\":\"" + getRemoteIP()
                 + "\",\"status\":" + status + "}";
 
         if(throwable != null && status >= 500){
@@ -331,6 +332,11 @@ private void logDone(Throwable throwable) {
         }
     }
 
+    private String getRemoteIP() {
+        String h = RequestContext.getHttpRequest().getHeader("X-Forwarded-For");
+        return !Util.blank(h) ? h : RequestContext.getHttpRequest().getRemoteAddr();
+    }
+
     public void destroy() {
         if(appBootstrap != null){ // failed start?
             appBootstrap.destroy(appContext);

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ private void initAppConfig(String configClassName, AppContext context, boolean f`
`146`	`146`	`throw new InitException(e);`
`147`	`147`	`}else{`
`148`	`148`	`logger.warn("Failed to create and init a new instance of class: " + configClassName`
`149`		`- + ", proceeding without it.", e);`
	`149`	`+ + ", proceeding without it.");`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`	`}`
`@@ -322,6 +322,7 @@ private void logDone(Throwable throwable) {`
`322`	`322`	`+ "\",\"url\":\"" + url`
`323`	`323`	`+ (redirectTarget != null ? "\",\"redirect_target\":\"" + redirectTarget: "")`
`324`	`324`	`+ (throwable != null ? "\",\"error\":\"" + JsonHelper.sanitize(throwable.getMessage() != null ? throwable.getMessage() : throwable.toString()) : "")`
	`325`	`+ + "\",\"remote_ip\":\"" + getRemoteIP()`
`325`	`326`	`+ "\",\"status\":" + status + "}";`
`326`	`327`
`327`	`328`	`if(throwable != null && status >= 500){`
`@@ -331,6 +332,11 @@ private void logDone(Throwable throwable) {`
`331`	`332`	`}`
`332`	`333`	`}`
`333`	`334`
	`335`	`+ private String getRemoteIP() {`
	`336`	`+ String h = RequestContext.getHttpRequest().getHeader("X-Forwarded-For");`
	`337`	`+ return !Util.blank(h) ? h : RequestContext.getHttpRequest().getRemoteAddr();`
	`338`	`+ }`
	`339`	`+`
`334`	`340`	`public void destroy() {`
`335`	`341`	`if(appBootstrap != null){ // failed start?`
`336`	`342`	`appBootstrap.destroy(appContext);`