Fix request logging (should be replaced by a middleware solution).

pkg/rest/handlers.go

@@ -139,23 +139,25 @@ func (h *pemsHndlr) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
 	resp.Header().Set("Content-Length", "0")
 	status := http.StatusTeapot
 	bytes := 0
-	defer reqLog(h.log, req, now, status, bytes)
 
 	matches := pemsRegex.FindStringSubmatch(req.URL.Path)
 	if matches == nil {
 		status = http.StatusNotFound
 		resp.WriteHeader(status)
+		reqLog(h.log, req, now, status, bytes)
 		return
 	}
 
 	if _, ok := allowedPems[req.Method]; !ok {
 		status = http.StatusMethodNotAllowed
 		resp.WriteHeader(status)
+		reqLog(h.log, req, now, status, bytes)
 		return
 	}
 	if req.Method == http.MethodGet || req.Method == http.MethodHead {
 		status = http.StatusNotImplemented
 		resp.WriteHeader(status)
+		reqLog(h.log, req, now, status, bytes)
 		return
 	}
 
@@ -172,6 +174,7 @@ func (h *pemsHndlr) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
 			resp.Header().Del("Content-Length")
 		}
 		resp.WriteHeader(status)
+		reqLog(h.log, req, now, status, bytes)
 		return
 	}
 
@@ -184,22 +187,26 @@ func (h *pemsHndlr) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
 	if have && req.Method == http.MethodPost {
 		status = http.StatusConflict
 		resp.WriteHeader(status)
+		reqLog(h.log, req, now, status, bytes)
 		return
 	} else if h.files.Check(ns, name, uid, version) {
 		status = http.StatusNoContent
 		resp.Header().Del("Content-Length")
 		resp.WriteHeader(status)
+		reqLog(h.log, req, now, status, bytes)
 		return
 	}
 	if found, valid, err := h.files.Write(ns, name, uid, version); !found {
 		status = http.StatusNotFound
 		resp.WriteHeader(status)
+		reqLog(h.log, req, now, status, bytes)
 		return
 	} else if !valid || err != nil {
 		// XXX problem description in body
 		status = http.StatusForbidden
 		errLog(h.log, req, err)
 		resp.WriteHeader(status)
+		reqLog(h.log, req, now, status, bytes)
 		return
 	}
 	if !have {
@@ -212,4 +219,5 @@ func (h *pemsHndlr) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
 	// XXX ETag: uid/version
 	// XXX LastModified: file mtime
 	resp.WriteHeader(status)
+	reqLog(h.log, req, now, status, bytes)
 }