Merge pull request #41 from xushiwei/q

x/http/fs.Root(), x/http/tracer.Tee/NewCodeRecorder

http/fs/fs.go

@@ -1,6 +1,7 @@
 package fs
 
 import (
+	"io"
 	"io/fs"
 	"net/http"
 	"os"
@@ -119,3 +120,67 @@ func FilesWithContent(files ...string) http.FileSystem {
 }
 
 // -----------------------------------------------------------------------------------------
+
+type rootDir struct {
+}
+
+func (p rootDir) Name() string {
+	return "/"
+}
+
+func (p rootDir) Size() int64 {
+	return 0
+}
+
+func (p rootDir) Mode() fs.FileMode {
+	return fs.ModeDir
+}
+
+func (p rootDir) ModTime() time.Time {
+	return time.Now()
+}
+
+func (p rootDir) IsDir() bool {
+	return true
+}
+
+func (p rootDir) Sys() interface{} {
+	return nil
+}
+
+func (p rootDir) Close() error {
+	return nil
+}
+
+func (p rootDir) Write(b []byte) (n int, err error) {
+	return 0, io.ErrUnexpectedEOF
+}
+
+func (p rootDir) Read(b []byte) (n int, err error) {
+	return 0, io.EOF
+}
+
+func (p rootDir) Readdir(count int) ([]fs.FileInfo, error) {
+	return nil, io.EOF
+}
+
+func (p rootDir) Seek(offset int64, whence int) (int64, error) {
+	return 0, io.EOF
+}
+
+func (p rootDir) Stat() (fs.FileInfo, error) {
+	return rootDir{}, nil
+}
+
+func (p rootDir) Open(name string) (f http.File, err error) {
+	if name == "/" {
+		return rootDir{}, nil
+	}
+	return nil, os.ErrNotExist
+}
+
+func Root() http.FileSystem {
+	return rootDir{}
+}
+
+// -----------------------------------------------------------------------------------------

http/tracer/tracer.go

@@ -3,11 +3,72 @@ package tracer
 import (
 	"log"
 	"net/http"
+	"time"
 )
 
+// -------------------------------------------------------------------------------
+
+type teeResponseWriter struct {
+	w []http.ResponseWriter
+}
+
+func (p *teeResponseWriter) Header() http.Header {
+	return p.w[0].Header()
+}
+
+func (p *teeResponseWriter) Write(buf []byte) (n int, err error) {
+	n, err = p.w[0].Write(buf)
+	for _, w := range p.w[1:] {
+		w.Write(buf)
+	}
+	return
+}
+
+func (p *teeResponseWriter) WriteHeader(statusCode int) {
+	p.w[0].WriteHeader(statusCode)
+	for _, w := range p.w[1:] {
+		w.WriteHeader(statusCode)
+	}
+}
+
+func Tee(w ...http.ResponseWriter) http.ResponseWriter {
+	return &teeResponseWriter{w}
+}
+
+// -------------------------------------------------------------------------------
+
+type CodeRecorder struct {
+	Code int
+}
+
+func (p *CodeRecorder) Header() http.Header {
+	return nil
+}
+
+func (p *CodeRecorder) Write(buf []byte) (n int, err error) {
+	return
+}
+
+func (p *CodeRecorder) WriteHeader(statusCode int) {
+	p.Code = statusCode
+}
+
+func NewCodeRecorder() *CodeRecorder {
+	return &CodeRecorder{}
+}
+
+// -------------------------------------------------------------------------------
+
 func New(h http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		recorder := NewCodeRecorder()
+		tee := Tee(w, recorder)
 		log.Printf("%s %v\n", r.Method, r.URL)
-		h.ServeHTTP(w, r)
+		start := time.Now()
+		h.ServeHTTP(tee, r)
+		dur := time.Since(start)
+		log.Printf("Returned %d in %d ms\n", recorder.Code, dur.Milliseconds())
 	})
 }
+
+// -------------------------------------------------------------------------------