Updates:

hoisie · hoisie · commit e551e3715aa5 · 2012-03-14T12:51:05.000-07:00
- logging: print params if they're present, and add some color
- Don't include Content-Type when returning 304
diff --git a/servefile.go b/servefile.go
@@ -58,13 +58,29 @@ func serveFile(ctx *Context, name string) {
     mtime := strconv.Itoa64(info.Mtime_ns)
     //set the last-modified header
     lm := time.SecondsToUTC(info.Mtime_ns / 1e9)
-    ctx.SetHeader("Last-Modified", webTime(lm), true)
+
+    if ctx.Request.Headers.Get("If-Modified-Since") != "" {
+        ims := ctx.Request.Headers.Get("If-Modified-Since")
+        imstime, err := time.Parse(time.RFC1123, ims)
+        if err == nil && imstime.Seconds() >= lm.Seconds() {
+            ctx.NotModified()
+            return
+        }
+    }
 
     //generate a simple etag with heuristic MD5(filename, size, lastmod)
     etagparts := []string{name, size, mtime}
     etag := fmt.Sprintf(`"%s"`, getmd5(strings.Join(etagparts, "|")))
-    ctx.SetHeader("ETag", etag, true)
+    if ctx.Request.Headers.Get("If-None-Match") != "" {
+        inm := ctx.Request.Headers.Get("If-None-Match")
+        if inm == etag {
+            ctx.NotModified()
+            return
+        }
+    }
 
+    ctx.SetHeader("ETag", etag, true)
+    ctx.SetHeader("Last-Modified", webTime(lm), true)
     //the first 1024 bytes of the file, used to detect content-type
     var firstChunk []byte
     ext := path.Ext(name)
@@ -82,24 +98,6 @@ func serveFile(ctx *Context, name string) {
         }
     }
 
-    if ctx.Request.Headers.Get("If-None-Match") != "" {
-        inm := ctx.Request.Headers.Get("If-None-Match")
-        if inm == etag {
-            ctx.NotModified()
-            return
-        }
-
-    }
-
-    if ctx.Request.Headers.Get("If-Modified-Since") != "" {
-        ims := ctx.Request.Headers.Get("If-Modified-Since")
-        imstime, err := time.Parse(time.RFC1123, ims)
-        if err == nil && imstime.Seconds() >= lm.Seconds() {
-            ctx.NotModified()
-            return
-        }
-    }
-
     //set content-length
     ctx.SetHeader("Content-Length", size, true)
     if ctx.Request.Method != "HEAD" {
diff --git a/web.go b/web.go
@@ -290,27 +290,25 @@ func requiresContext(handlerType reflect.Type) bool {
 }
 
 func (s *Server) routeHandler(req *Request, c conn) {
+    ctx := Context{req, s, c, false}
     requestPath := req.URL.Path
 
     //log the request
-    if len(req.URL.RawQuery) == 0 {
-        s.Logger.Println(req.Method + " " + requestPath)
-    } else {
-        s.Logger.Println(req.Method + " " + requestPath + "?" + req.URL.RawQuery)
-    }
+    var logEntry bytes.Buffer
+    logEntry.WriteString(fmt.Sprintf("\033[32;1m%s %s\033[0m", req.Method, requestPath))
 
     //parse the form data (if it exists)
     perr := req.parseParams()
     if perr != nil {
-        s.Logger.Printf("Failed to parse form data %q\n", perr.String())
+        logEntry.WriteString(fmt.Sprintf("\nFailed to parse parms%q\n", perr.String()))
+    } else if len(ctx.Params) > 0 {
+        logEntry.WriteString(fmt.Sprintf("\n\033[37;1mParams: %v\033[0m\n", ctx.Params))
     }
 
-    ctx := Context{req, s, c, false}
+    ctx.Logger.Print(logEntry.String())
 
     //set some default headers
-    ctx.SetHeader("Content-Type", "text/html; charset=utf-8", true)
     ctx.SetHeader("Server", "web.go", true)
-
     tm := time.UTC()
     ctx.SetHeader("Date", webTime(tm), true)
 
@@ -325,6 +323,8 @@ func (s *Server) routeHandler(req *Request, c conn) {
         return
     }
 
+    //Set the default content-type
+    ctx.SetHeader("Content-Type", "text/html; charset=utf-8", true)
     for i := 0; i < len(s.routes); i++ {
         route := s.routes[i]
         cr := route.cr
diff --git a/web_test.go b/web_test.go
@@ -177,7 +177,10 @@ func init() {
     })
 
     Post("/parsejson", func(ctx *Context) string {
-        var tmp = struct{ A string; B string }{}
+        var tmp = struct {
+            A   string
+            B   string
+        }{}
         json.NewDecoder(ctx.Request.Body).Decode(&tmp)
         return tmp.A + " " + tmp.B
     })
@@ -236,7 +239,7 @@ func buildTestRequest(method string, path string, body string, headers map[strin
         headers["Content-Length"] = []string{fmt.Sprintf("%d", len(body))}
         if headers["Content-Type"] == nil {
             headers["Content-Type"] = []string{"text/plain"}
-        } 
+        }
     }
 
     req := Request{Method: method,
@@ -678,7 +681,6 @@ func TestSecureCookieFcgi(t *testing.T) {
     }
 }
 
-
 //Disabled until issue 1375 is fixed
 /*
 func TestCloseServer(t *testing.T) {
