Merge pull request baasbox#62 from giastfader/master

giastfader · giastfader · commit 980cf2c74c8e · 2013-08-20T11:14:17.000-07:00
Version 0.6
diff --git a/app/com/baasbox/controllers/actions/filters/WrapResponse.java b/app/com/baasbox/controllers/actions/filters/WrapResponse.java
@@ -17,6 +17,7 @@
 package com.baasbox.controllers.actions.filters;
 
 import java.io.IOException;
+import java.util.HashMap;
 
 import org.codehaus.jackson.JsonProcessingException;
 import org.codehaus.jackson.map.ObjectMapper;
@@ -103,7 +104,10 @@ public Result wrap(Context ctx, Result result) throws Throwable {
 		Logger.trace("Method Start");
 		
 		ctx.response().setHeader("Access-Control-Allow-Origin", "*");
-		
+		//this is an hack because scala can't access to the http context, and we need this information for the access log
+		String username=(String) ctx.args.get("username");
+		if (username!=null) ctx.response().setHeader("BB-USERNAME", username);
+
 		if (BBConfiguration.getWrapResponse()){
 			Logger.debug("Wrapping the response");
 			final int statusCode = JavaResultExtractor.getStatus(result);
@@ -134,9 +138,12 @@ public Result wrap(Context ctx, Result result) throws Throwable {
 		    }else{ //status is not an error
 		    	result=onOk(statusCode,ctx.request(),stringBody);
 		    } //if (statusCode>399)
+			//We was expecting that this would be done by the framework, apparently this is false 
+			ctx.response().setHeader("Content-Length",String.valueOf(JavaResultExtractor.getBody(result).length));
 		}else{ //if (BBConfiguration.getWrapResponse())
 			Logger.debug("The response will not be wrapped due configuration parameter");
 		}
+
 	    Logger.debug("  + result: \n" + result.toString());
 		Logger.trace("Method End");
 	    return result;
diff --git a/app/com/baasbox/controllers/actions/filters/accesslog/AccessLogFilter.scala b/app/com/baasbox/controllers/actions/filters/accesslog/AccessLogFilter.scala
@@ -17,7 +17,14 @@ package com.baasbox.filters {
       			val time = System.currentTimeMillis - start
       			val dateFormatted = new Date(start)
       			val userAgent = rh.headers.get("User-Agent").getOrElse("")
-      			filterLogger.info(s"${rh.remoteAddress}\t[${dateFormatted}]\t${rh.method}\t${rh.uri}\t${rh.version}\t${result.header.status}\t${userAgent}\t${rh.contentType}\t-\t${time}")
+      			val contentLength = result.header.headers.get("Content-Length").getOrElse("-")
+      			/*
+      			* Log format is the combined one: http://httpd.apache.org/docs/2.2/logs.html
+      			* Unfortunely we have to do a litlle hack to log the authenticated username due a limitation of the framework: scala cannot access to the current Http Context where the username is stored
+      			*/
+      			val username = result.header.headers.get("BB-USERNAME").getOrElse("-")
+      			result.withHeaders("BB-USERNAME"->"")
+      			filterLogger.info(s"""${rh.remoteAddress}\t-\t${username}\t[${dateFormatted}]\t${"\""}${rh.method} ${rh.uri} ${rh.version}${"\""}\t${result.header.status}\t${contentLength}\t${"\""}${"\""}\t${"\""}${userAgent}${"\""}\t${time}""")
       			result
     		}
     
diff --git a/conf/application.conf b/conf/application.conf
@@ -37,7 +37,7 @@ logger.baasbox.accesslog=TRACE
 
 #baasbox api version
 
-api.version="0.6.0-snapshot"
+api.version="0.6.0"
 
 #baasbox orientdb credential
 orient.baasbox.user=baasbox
