From 2fbaf3a363254ea1562358ddecee1f53afd756bb Mon Sep 17 00:00:00 2001 From: Vishal Rana Date: Tue, 25 Oct 2016 08:08:46 -0700 Subject: [PATCH] minor refactor, #677 Signed-off-by: Vishal Rana --- context.go | 5 ++++- middleware/logger.go | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/context.go b/context.go index 33614e5a..49bb392b 100644 --- a/context.go +++ b/context.go @@ -421,10 +421,13 @@ func (c *context) XML(code int, i interface{}) (err error) { } func (c *context) XMLBlob(code int, b []byte) (err error) { + c.response.Header().Set(HeaderContentType, MIMEApplicationXMLCharsetUTF8) + c.response.WriteHeader(code) if _, err = c.response.Write([]byte(xml.Header)); err != nil { return } - return c.Blob(code, MIMEApplicationXMLCharsetUTF8, b) + _, err = c.response.Write(b) + return } func (c *context) Blob(code int, contentType string, b []byte) (err error) { diff --git a/middleware/logger.go b/middleware/logger.go index 90bac285..395b2ea5 100644 --- a/middleware/logger.go +++ b/middleware/logger.go @@ -46,9 +46,9 @@ type ( // Optional. Default value os.Stdout. Output io.Writer - template *fasttemplate.Template - color *color.Color - bufferPool sync.Pool + template *fasttemplate.Template + color *color.Color + pool sync.Pool } ) @@ -89,7 +89,7 @@ func LoggerWithConfig(config LoggerConfig) echo.MiddlewareFunc { if w, ok := config.Output.(*os.File); !ok || !isatty.IsTerminal(w.Fd()) { config.color.Disable() } - config.bufferPool = sync.Pool{ + config.pool = sync.Pool{ New: func() interface{} { return bytes.NewBuffer(make([]byte, 256)) }, @@ -108,9 +108,9 @@ func LoggerWithConfig(config LoggerConfig) echo.MiddlewareFunc { c.Error(err) } stop := time.Now() - buf := config.bufferPool.Get().(*bytes.Buffer) + buf := config.pool.Get().(*bytes.Buffer) buf.Reset() - defer config.bufferPool.Put(buf) + defer config.pool.Put(buf) _, err = config.template.ExecuteFunc(buf, func(w io.Writer, tag string) (int, error) { switch tag {