Merge branch 'develop'

This commit is contained in:
Manu Mtz-Almeida 2014-07-02 11:06:22 +02:00
commit f99a2ac7cc
3 changed files with 33 additions and 8 deletions

33
gin.go
View File

@ -1,8 +1,11 @@
package gin
import (
"bytes"
"encoding/json"
"encoding/xml"
"errors"
"fmt"
"github.com/julienschmidt/httprouter"
"html/template"
"log"
@ -22,17 +25,19 @@ type (
// Used internally to collect a error ocurred during a http request.
ErrorMsg struct {
Message string `json:"msg"`
Err string `json:"error"`
Meta interface{} `json:"meta"`
}
ErrorMsgs []ErrorMsg
// Context is the most important part of gin. It allows us to pass variables between middleware,
// manage the flow, validate the JSON of a request and render a JSON response for example.
Context struct {
Req *http.Request
Writer http.ResponseWriter
Keys map[string]interface{}
Errors []ErrorMsg
Errors ErrorMsgs
Params httprouter.Params
handlers []HandlerFunc
engine *Engine
@ -57,6 +62,15 @@ type (
}
)
func (a ErrorMsgs) String() string {
var buffer bytes.Buffer
for i, msg := range a {
text := fmt.Sprintf("Error #%02d: %s \n Meta: %v\n\n", (i + 1), msg.Err, msg.Meta)
buffer.WriteString(text)
}
return buffer.String()
}
// Returns a new blank Engine instance without any middleware attached.
// The most basic configuration
func New() *Engine {
@ -240,11 +254,20 @@ func (c *Context) Fail(code int, err error) {
// A middleware can be used to collect all the errors and push them to a database together, print a log, or append it in the HTTP response.
func (c *Context) Error(err error, meta interface{}) {
c.Errors = append(c.Errors, ErrorMsg{
Message: err.Error(),
Err: err.Error(),
Meta: meta,
})
}
func (c *Context) LastError() error {
s := len(c.Errors)
if s > 0 {
return errors.New(c.Errors[s-1].Err)
} else {
return nil
}
}
/************************************/
/******** METADATA MANAGEMENT********/
/************************************/
@ -344,8 +367,10 @@ func (c *Context) HTML(code int, name string, data interface{}) {
// Writes the given string into the response body and sets the Content-Type to "text/plain"
func (c *Context) String(code int, msg string) {
c.Writer.Header().Set("Content-Type", "text/plain")
if code >= 0 {
c.Writer.WriteHeader(code)
}
c.Writer.Header().Set("Content-Type", "text/plain")
c.Writer.Write([]byte(msg))
}

View File

@ -29,7 +29,7 @@ func Logger() HandlerFunc {
// Calculate resolution time
log.Printf("%s in %v", c.Req.RequestURI, time.Since(t))
if len(c.Errors) > 0 {
fmt.Println(c.Errors)
fmt.Println(c.Errors.String())
}
}
}

View File

@ -83,7 +83,7 @@ func Recovery() HandlerFunc {
return func(c *Context) {
defer func() {
if len(c.Errors) > 0 {
log.Println(c.Errors)
log.Println(c.Errors.String())
}
if err := recover(); err != nil {
stack := stack(3)