sashakoshka/go-gemini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

examples/server: Clean up LoggingMiddleware

Browse Source
This commit is contained in:
Adnan Maolood 2021-02-27 14:53:37 -05:00
parent 6a1ccdc644
commit fcc71b76d9
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/server.go
View File

@ -26,7 +26,7 @@ func main() {
mux.Handle("/", gemini.FileServer(os.DirFS("/var/www"))) mux.Handle("/", gemini.FileServer(os.DirFS("/var/www")))
server := &gemini.Server{ server := &gemini.Server{
Handler: logMiddleware(mux), Handler: LoggingMiddleware(mux),
ReadTimeout: 30 * time.Second, ReadTimeout: 30 * time.Second,
WriteTimeout: 1 * time.Minute, WriteTimeout: 1 * time.Minute,
GetCertificate: certificates.Get, GetCertificate: certificates.Get,
@ -57,22 +57,21 @@ func main() {
} }
} }
func logMiddleware(h gemini.Handler) gemini.Handler { func LoggingMiddleware(h gemini.Handler) gemini.Handler {
return gemini.HandlerFunc(func(ctx context.Context, w gemini.ResponseWriter, r *gemini.Request) { return gemini.HandlerFunc(func(ctx context.Context, w gemini.ResponseWriter, r *gemini.Request) {
lw := &logResponseWriter{rw: w} lw := &logResponseWriter{rw: w}
h.ServeGemini(ctx, lw, r) h.ServeGemini(ctx, lw, r)
host := r.TLS().ServerName host := r.TLS().ServerName
log.Printf("gemini: %s %q %d %d", host, r.URL, lw.status, lw.wrote) log.Printf("gemini: %s %q %d %d", host, r.URL, lw.Status, lw.Wrote)
}) })
} }
type logResponseWriter struct { type logResponseWriter struct {
Status gemini.Status
Wrote int
rw gemini.ResponseWriter rw gemini.ResponseWriter
status gemini.Status
meta string
mediatype string mediatype string
wroteHeader bool wroteHeader bool
wrote int
} }
func (w *logResponseWriter) SetMediaType(mediatype string) { func (w *logResponseWriter) SetMediaType(mediatype string) {
@ -84,7 +83,7 @@ func (w *logResponseWriter) Write(b []byte) (int, error) {
w.WriteHeader(gemini.StatusSuccess, w.mediatype) w.WriteHeader(gemini.StatusSuccess, w.mediatype)
} }
n, err := w.rw.Write(b) n, err := w.rw.Write(b)
w.wrote += n w.Wrote += n
return n, err return n, err
} }
@ -92,11 +91,10 @@ func (w *logResponseWriter) WriteHeader(status gemini.Status, meta string) {
if w.wroteHeader { if w.wroteHeader {
return return
} }
w.status = status
w.meta = meta
w.wroteHeader = true w.wroteHeader = true
w.Status = status
w.Wrote += len(meta) + 5
w.rw.WriteHeader(status, meta) w.rw.WriteHeader(status, meta)
w.wrote += len(meta) + 5
} }
func (w *logResponseWriter) Flush() error { func (w *logResponseWriter) Flush() error {