Merge pull request #15 from go-rs/develop

Fixed context related issue

Author: roshangade

README.md

@@ -77,9 +77,6 @@ user.Get("/:uid", func(ctx *rest.Context) {
 })
 ```
 
-###Pending 
-- Stop execution on timeout/abort
-
 ## Documentation
 https://godoc.org/github.com/go-rs/rest-api-framework
 

api.go

@@ -171,6 +171,7 @@ func (api *API) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 	ctx.init()
 	defer ctx.destroy()
 
+	// recovery/handle any runtime error
 	defer func() {
 		err := recover()
 		if err != nil {
@@ -183,9 +184,18 @@ func (api *API) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 		}
 	}()
 
+	// On context done, stop execution
+	go func() {
+		c := req.Context()
+		select {
+		case <-c.Done():
+			ctx.End()
+		}
+	}()
+
 	// STEP 2: execute all interceptors
 	for _, task := range api.interceptors {
-		if ctx.end || ctx.code != "" {
+		if ctx.shouldBreak() {
 			break
 		}
 
@@ -195,34 +205,35 @@ func (api *API) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 	// STEP 3: check routes
 	urlPath := []byte(req.URL.Path)
 	for _, route := range api.routes {
-		if ctx.end || ctx.code != "" {
+		if ctx.shouldBreak() {
 			break
 		}
 
 		if (route.method == "" || strings.EqualFold(route.method, req.Method)) && route.regex.Match(urlPath) {
-			ctx.found = route.method != "" //?
 			ctx.Params = utils.Exec(route.regex, route.params, urlPath)
 			route.handle(ctx)
 		}
 	}
 
 	// STEP 4: check handled exceptions
 	for _, exp := range api.exceptions {
-		if ctx.end || ctx.code == "" {
+		if ctx.shouldBreak() {
 			break
 		}
 
-		if exp.code == ctx.code {
+		if strings.EqualFold(exp.code, ctx.code) {
 			exp.handle(ctx)
 		}
 	}
 
 	// STEP 5: unhandled exceptions
 	if !ctx.end {
-		if ctx.code == "" && !ctx.found {
+		// if no error and still not ended that means it NOT FOUND
+		if ctx.code == "" {
 			ctx.Throw(ErrCodeNotFound)
 		}
 
+		// if user has custom unhandled function, then execute it
 		if api.unhandled != nil {
 			api.unhandled(ctx)
 		}

context.go

@@ -5,6 +5,7 @@
 package rest
 
 import (
+	"fmt"
 	"log"
 	"net/http"
 	"net/url"
@@ -32,7 +33,6 @@ type Context struct {
 	code            string
 	err             error
 	status          int
-	found           bool
 	end             bool
 	requestSent     bool
 	preTasksCalled  bool
@@ -62,7 +62,6 @@ func (ctx *Context) destroy() {
 	ctx.code = ""
 	ctx.err = nil
 	ctx.status = 0
-	ctx.found = false
 	ctx.end = false
 	ctx.requestSent = false
 	ctx.preTasksCalled = false
@@ -154,6 +153,10 @@ func (ctx *Context) PostSend(task Task) {
 }
 
 //////////////////////////////////////////////////
+func (ctx *Context) shouldBreak() (flag bool) {
+	return ctx.end || ctx.code != ""
+}
+
 // Send data, which uses bytes or error if any
 // Also, it calls pre-send and post-send registered hooks
 func (ctx *Context) send(data []byte, err error) {
@@ -191,7 +194,7 @@ func (ctx *Context) send(data []byte, err error) {
 
 		if err != nil {
 			//TODO: debugger mode
-			log.Println("Response Error: ", err)
+			log.Printf("response error: %v", err)
 		}
 	}
 
@@ -220,9 +223,9 @@ func (ctx *Context) unhandledException() {
 	}
 
 	if ctx.code != "" || ctx.err != nil {
-		msg := "Error Code: " + ctx.code
+		msg := fmt.Sprintf("error code: %v", ctx.code)
 		if ctx.err != nil {
-			msg += "\nError Message: " + ctx.err.Error()
+			msg += fmt.Sprintf("\nerror message: %v", ctx.err)
 		}
 		ctx.SetHeader("Content-Type", "text/plain;charset=UTF-8")
 		if ctx.status < 400 {
@@ -237,9 +240,9 @@ func (ctx *Context) recover() {
 	err := recover()
 	if err != nil {
 		//TODO: debugger mode
-		log.Println("Runtime Error: ", err)
+		log.Printf("runtime error: %v", err)
 		if !ctx.requestSent {
-			http.Error(ctx.Response, "Internal Server Error", http.StatusInternalServerError)
+			http.Error(ctx.Response, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		}
 	}
 }

examples/server.go

@@ -54,11 +54,11 @@ func main() {
 
 	fmt.Println("Starting server.")
 
-	tout := http.TimeoutHandler(api, 100*time.Millisecond, "timeout")
+	//tout := http.TimeoutHandler(api, 100*time.Millisecond, "timeout")
 
 	server := http.Server{
 		Addr:    ":8080",
-		Handler: tout,
+		Handler: api, //tout,
 	}
 
 	if err := server.ListenAndServe(); err != nil {

examples/user/user.go

@@ -4,6 +4,7 @@ import (
 	"github.com/go-rs/rest-api-framework"
 )
 
+// just a simple method, can use in better way
 func Load(api *rest.API) {
 
 	var user = rest.Extend("/user", api)