status recorder

Marko Tikvić
1 parent 8a070abe23
Showing 2 changed files with 35 additions and 15 deletions Show diff stats
http.go
middleware_log.go
@@ -6,24 +6,45 @@ import (
 	"net/http"
 )
  
-type ResponseWriterStatusRecorder struct {
-	http.ResponseWriter
+type StatusRecorder struct {
+	writer http.ResponseWriter
 	status int
+	size   int
 }
  
-func WrapWithStatusRecorder(w http.ResponseWriter) *ResponseWriterStatusRecorder {
-	return &ResponseWriterStatusRecorder{w, 0}
+func NewStatusRecorder(w http.ResponseWriter) *StatusRecorder {
+	return &StatusRecorder{
+		writer: w,
+		status: 0,
+		size:   0,
+	}
 }
  
-func (r *ResponseWriterStatusRecorder) WriteHeader(code int) {
+// http.ResponseWriter interface
+func (r *StatusRecorder) WriteHeader(code int) {
 	r.status = code
-	r.ResponseWriter.WriteHeader(code)
+	r.writer.WriteHeader(code)
+}
+
+// http.ResponseWriter interface
+func (r *StatusRecorder) Write(in []byte) (int, error) {
+	r.size = len(in)
+	return r.writer.Write(in)
 }
  
-func (r *ResponseWriterStatusRecorder) Status() int {
+// http.ResponseWriter interface
+func (r *StatusRecorder) Header() http.Header {
+	return r.writer.Header()
+}
+
+func (r *StatusRecorder) Status() int {
 	return r.status
 }
  
+func (r *StatusRecorder) Size() int {
+	return r.size
+}
+
 // NotFoundHandlerFunc writes HTTP error 404 to w.
 func NotFoundHandlerFunc(w http.ResponseWriter, req *http.Request) {
 	SetDefaultHeaders(w)
@@ -7,10 +7,10 @@ import (
 	"git.to-net.rs/marko.tikvic/gologger"
 )
  
-var trafficLogger *gologger.Logger
+var httpLogger *gologger.Logger
  
 func EnableLogging(log string) (err error) {
-	trafficLogger, err = gologger.New(log, gologger.MaxLogSize5MB)
+	httpLogger, err = gologger.New(log, gologger.MaxLogSize5MB)
 	return err
 }
  
@@ -19,16 +19,15 @@ func Log(h http.HandlerFunc) http.HandlerFunc {
 		t1 := time.Now()
  
 		claims, _ := GetTokenClaims(req)
+		in := httpLogger.LogHTTPRequest(req, claims.Username)
  
-		in := trafficLogger.RequestLog(req, claims.Username)
+		rec := NewStatusRecorder(w)
  
-		wRec := WrapWithStatusRecorder(w)
-		h(wRec, req)
+		h(rec, req)
  
 		t2 := time.Now()
+		out := httpLogger.LogHTTPResponse(rec.Status(), t2.Sub(t1), rec.Size())
  
-		out := trafficLogger.ResponseLog(wRec.Status(), t2.Sub(t1), 0)
-
-		trafficLogger.LogHTTPTraffic(in, out)
+		httpLogger.CombineHTTPLogs(in, out)
 	}
 }
...	...	@@ -6,24 +6,45 @@ import (
6	6	"net/http"
7	7	)
8	8
9		-type ResponseWriterStatusRecorder struct {
10		- http.ResponseWriter
	9	+type StatusRecorder struct {
	10	+ writer http.ResponseWriter
11	11	status int
	12	+ size int
12	13	}
13	14
14		-func WrapWithStatusRecorder(w http.ResponseWriter) *ResponseWriterStatusRecorder {
15		- return &ResponseWriterStatusRecorder{w, 0}
	15	+func NewStatusRecorder(w http.ResponseWriter) *StatusRecorder {
	16	+ return &StatusRecorder{
	17	+ writer: w,
	18	+ status: 0,
	19	+ size: 0,
	20	+ }
16	21	}
17	22
18		-func (r *ResponseWriterStatusRecorder) WriteHeader(code int) {
	23	+// http.ResponseWriter interface
	24	+func (r *StatusRecorder) WriteHeader(code int) {
19	25	r.status = code
20		- r.ResponseWriter.WriteHeader(code)
	26	+ r.writer.WriteHeader(code)
	27	+}
	28	+
	29	+// http.ResponseWriter interface
	30	+func (r *StatusRecorder) Write(in []byte) (int, error) {
	31	+ r.size = len(in)
	32	+ return r.writer.Write(in)
21	33	}
22	34
23		-func (r *ResponseWriterStatusRecorder) Status() int {
	35	+// http.ResponseWriter interface
	36	+func (r *StatusRecorder) Header() http.Header {
	37	+ return r.writer.Header()
	38	+}
	39	+
	40	+func (r *StatusRecorder) Status() int {
24	41	return r.status
25	42	}
26	43
	44	+func (r *StatusRecorder) Size() int {
	45	+ return r.size
	46	+}
	47	+
27	48	// NotFoundHandlerFunc writes HTTP error 404 to w.
28	49	func NotFoundHandlerFunc(w http.ResponseWriter, req *http.Request) {
29	50	SetDefaultHeaders(w)
...	...
...	...	@@ -7,10 +7,10 @@ import (
7	7	"git.to-net.rs/marko.tikvic/gologger"
8	8	)
9	9
10		-var trafficLogger *gologger.Logger
	10	+var httpLogger *gologger.Logger
11	11
12	12	func EnableLogging(log string) (err error) {
13		- trafficLogger, err = gologger.New(log, gologger.MaxLogSize5MB)
	13	+ httpLogger, err = gologger.New(log, gologger.MaxLogSize5MB)
14	14	return err
15	15	}
16	16
...	...	@@ -19,16 +19,15 @@ func Log(h http.HandlerFunc) http.HandlerFunc {
19	19	t1 := time.Now()
20	20
21	21	claims, _ := GetTokenClaims(req)
	22	+ in := httpLogger.LogHTTPRequest(req, claims.Username)
22	23
23		- in := trafficLogger.RequestLog(req, claims.Username)
	24	+ rec := NewStatusRecorder(w)
24	25
25		- wRec := WrapWithStatusRecorder(w)
26		- h(wRec, req)
	26	+ h(rec, req)
27	27
28	28	t2 := time.Now()
	29	+ out := httpLogger.LogHTTPResponse(rec.Status(), t2.Sub(t1), rec.Size())
29	30
30		- out := trafficLogger.ResponseLog(wRec.Status(), t2.Sub(t1), 0)
31		-
32		- trafficLogger.LogHTTPTraffic(in, out)
	31	+ httpLogger.CombineHTTPLogs(in, out)
33	32	}
34	33	}
...	...