#52, #53 apply minifier, cache-control to prod env profile

aah.go

@@ -38,6 +38,7 @@ var (
 	appSSLKey             string
 	appIsSSLEnabled       bool
 	appIsLetsEncrypt      bool
+	appIsProfileProd      bool
 	appMultipartMaxMemory int64
 	appPID                int
 	appInitialized        bool
@@ -161,6 +162,7 @@ func SetAppProfile(profile string) error {
 	}
 
 	appProfile = profile
+	appIsProfileProd = appProfile == "prod"
 	return nil
 }
 

engine.go

@@ -262,24 +262,9 @@ func (e *engine) writeReply(ctx *Context) {
 	// resolving view template
 	e.resolveView(ctx)
 
-	// Render and detect the errors earlier, framework can write error info
-	// without messing with response.
-	// HTTP Body
-	reply.body = e.getBuffer()
-	if reply.Rdr != nil {
-		if jsonp, ok := reply.Rdr.(*JSON); ok && ctx.Req.IsJSONP() && jsonp.IsJSONP {
-			if ess.IsStrEmpty(jsonp.Callback) {
-				jsonp.Callback = ctx.Req.QueryValue("callback")
-			}
-		}
-
-		if err := reply.Rdr.Render(reply.body); err != nil {
-			log.Error("Render response body error: ", err)
-			reply.InternalServerError()
-			reply.body.Reset()
-			reply.body.WriteString("500 Internal Server Error\n")
-		}
-	}
+	// Render it and detect the errors earlier. So that framework can write
+	// error info without messing with response on the wire.
+	e.doRender(ctx)
 
 	// Gzip
 	if !isNoGzipStatusCode(reply.Code) && reply.body.Len() != 0 {
@@ -299,7 +284,7 @@ func (e *engine) writeReply(ctx *Context) {
 	ctx.Res.WriteHeader(reply.Code)
 
 	// Write response buffer on the wire
-	if minifier == nil ||
+	if minifier == nil || !appIsProfileProd ||
 		isNoGzipStatusCode(reply.Code) ||
 		!ahttp.ContentTypeHTML.IsEqual(reply.ContType) {
 		_, _ = reply.body.WriteTo(ctx.Res)

render.go

@@ -15,6 +15,7 @@ import (
 	"path/filepath"
 
 	"aahframework.org/essentials.v0"
+	"aahframework.org/log.v0"
 )
 
 type (
@@ -193,3 +194,24 @@ func (h *HTML) Render(w io.Writer) error {
 
 	return h.Template.ExecuteTemplate(w, h.Layout, h.ViewArgs)
 }
+
+// doRender method renders and detects the errors earlier. Writes the
+// error info if any.
+func (e *engine) doRender(ctx *Context) {
+	if ctx.Reply().Rdr != nil {
+		reply := ctx.Reply()
+		reply.body = e.getBuffer()
+		if jsonp, ok := reply.Rdr.(*JSON); ok && jsonp.IsJSONP {
+			if ess.IsStrEmpty(jsonp.Callback) {
+				jsonp.Callback = ctx.Req.QueryValue("callback")
+			}
+		}
+
+		if err := reply.Rdr.Render(reply.body); err != nil {
+			log.Error("Render response body error: ", err)
+			reply.InternalServerError()
+			reply.body.Reset()
+			reply.body.WriteString("500 Internal Server Error\n")
+		}
+	}
+}

static.go

@@ -77,10 +77,14 @@ func (e *engine) serveStatic(ctx *Context) error {
 
 	// Serve file
 	if fi.Mode().IsRegular() {
-		// Write `Cache-Control` header based on `cache.static.*`
+		// `Cache-Control` header based on `cache.static.*`
 		if contentType, err := detectStaticContentType(filePath, f); err == nil {
 			ctx.Res.Header().Set(ahttp.HeaderContentType, contentType)
-			ctx.Res.Header().Set(ahttp.HeaderCacheControl, cacheHeader(contentType))
+
+			// apply cache header if environment profile is `prod`
+			if appIsProfileProd {
+				ctx.Res.Header().Set(ahttp.HeaderCacheControl, cacheHeader(contentType))
+			}
 		}
 
 		// 'OnPreReply' server extension point

static_test.go

@@ -22,6 +22,7 @@ import (
 func TestStaticDirectoryListing(t *testing.T) {
 	appCfg, _ := config.ParseString("")
 	e := newEngine(appCfg)
+	appIsProfileProd = true
 
 	testStaticServe(t, e, "http://localhost:8080/static/css/aah\x00.css", "static", "css/aah\x00.css", "", "500 Internal Server Error", false)
 
@@ -34,6 +35,7 @@ func TestStaticDirectoryListing(t *testing.T) {
 	testStaticServe(t, e, "http://localhost:8080/static/", "static", "", "", `<title>Listing of /static/</title>`, true)
 
 	testStaticServe(t, e, "http://localhost:8080/robots.txt", "", "", "test.txt", "This is file content of test.txt", false)
+	appIsProfileProd = false
 }
 
 func TestStaticMisc(t *testing.T) {