Cosmetic changes

vovkasm · Mar 23, 2015 · 48fec06 · 48fec06
1 parent 3e3ced7
commit 48fec06
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 20 deletions.
diff --git a/auth_test.go b/auth_test.go
@@ -76,7 +76,7 @@ func TestBasicAuth401WithCustomRealm(t *testing.T) {
 	r.ServeHTTP(w, req)
 
 	if w.Code != 401 {
-		t.Errorf("Response code should be Not autorized, was: %s", w.Code)
+		t.Errorf("Response code should be Not autorized, was: %d", w.Code)
 	}
 
 	if w.HeaderMap.Get("WWW-Authenticate") != "Basic realm=\"My Custom Realm\"" {

diff --git a/context.go b/context.go
@@ -362,7 +362,7 @@ func (c *Context) Redirect(code int, location string) {
 	if code >= 300 && code <= 308 {
 		c.Render(code, render.Redirect, location)
 	} else {
-		panic(fmt.Sprintf("Cannot send a redirect with status code %d", code))
+		log.Panicf("Cannot send a redirect with status code %d", code)
 	}
 }
 

diff --git a/debug.go b/debug.go
@@ -0,0 +1,25 @@
+// Copyright 2014 Manu Martinez-Almeida.  All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package gin
+
+import "log"
+
+func IsDebugging() bool {
+	return gin_mode == debugCode
+}
+
+func debugRoute(httpMethod, absolutePath string, handlers []HandlerFunc) {
+	if IsDebugging() {
+		nuHandlers := len(handlers)
+		handlerName := nameOfFunction(handlers[nuHandlers-1])
+		debugPrint("%-5s %-25s --> %s (%d handlers)\n", httpMethod, absolutePath, handlerName, nuHandlers)
+	}
+}
+
+func debugPrint(format string, values ...interface{}) {
+	if IsDebugging() {
+		log.Printf("[GIN-debug] "+format, values...)
+	}
+}
diff --git a/deprecated.go b/deprecated.go
@@ -5,8 +5,9 @@
 package gin
 
 import (
-	"github.com/gin-gonic/gin/binding"
 	"net/http"
+
+	"github.com/gin-gonic/gin/binding"
 )
 
 // DEPRECATED, use Bind() instead.

diff --git a/logger.go b/logger.go
@@ -5,9 +5,10 @@
 package gin
 
 import (
-	"github.com/mattn/go-colorable"
 	"log"
 	"time"
+
+	"github.com/mattn/go-colorable"
 )
 
 var (

diff --git a/mode.go b/mode.go
@@ -51,13 +51,3 @@ func SetMode(value string) {
 func Mode() string {
 	return mode_name
 }
-
-func IsDebugging() bool {
-	return gin_mode == debugCode
-}
-
-func debugPrint(format string, values ...interface{}) {
-	if IsDebugging() {
-		log.Printf("[GIN-debug] "+format, values...)
-	}
-}
diff --git a/routergroup.go b/routergroup.go
@@ -5,9 +5,10 @@
 package gin
 
 import (
-	"github.com/julienschmidt/httprouter"
 	"net/http"
 	"path"
+
+	"github.com/julienschmidt/httprouter"
 )
 
 // Used internally to configure router, a RouterGroup is associated with a prefix
@@ -46,11 +47,7 @@ func (group *RouterGroup) Group(relativePath string, handlers ...HandlerFunc) *R
 func (group *RouterGroup) Handle(httpMethod, relativePath string, handlers []HandlerFunc) {
 	absolutePath := group.calculateAbsolutePath(relativePath)
 	handlers = group.combineHandlers(handlers)
-	if IsDebugging() {
-		nuHandlers := len(handlers)
-		handlerName := nameOfFunction(handlers[nuHandlers-1])
-		debugPrint("%-5s %-25s --> %s (%d handlers)\n", httpMethod, absolutePath, handlerName, nuHandlers)
-	}
+	debugRoute(httpMethod, absolutePath, handlers)
 
 	group.engine.router.Handle(httpMethod, absolutePath, func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
 		context := group.engine.createContext(w, req, params, handlers)