Logged as error for json unmarshal error

notzippy · notzippy · commit b1df5bf2dde8 · 2017-09-13T09:36:07.000-07:00
Changed module filepath match to use filepath library
Assigned typeOfController when controller match requested
diff --git a/binder.go b/binder.go
@@ -298,7 +298,7 @@ func bindStruct(params *Params, name string, typ reflect.Type) reflect.Value {
 	if params.JSON != nil {
 		// Try to inject the response as a json into the created result
 		if err := json.Unmarshal(params.JSON, resultPointer.Interface()); err != nil {
-			binderLog.Warn("bindStruct Unable to unmarshal request", "name", name, "error", err)
+			binderLog.Error("bindStruct Unable to unmarshal request", "name", name, "error", err,"data", string(params.JSON))
 		}
 		return result
 	}
diff --git a/module.go b/module.go
@@ -88,7 +88,7 @@ func ModuleFromPath(path string, addGopathToPath bool) (module *Module) {
 	for i := range Modules {
 		if addGopathToPath {
 			for _, gopath := range gopathList {
-				if strings.HasPrefix(gopath+"/src/"+path, Modules[i].Path) {
+				if strings.HasPrefix(filepath.ToSlash(filepath.Clean(filepath.Join(gopath,"src",path))), Modules[i].Path) {
 					module = Modules[i]
 					break
 				}
@@ -164,6 +164,8 @@ func loadModules() {
 			if strings.HasPrefix(key, m.ImportPath) {
 				moduleLog.Debug("Module called callback", "moduleKey", m.ImportPath, "callbackKey", key)
 				callback(m)
+				found = true
+				break
 			}
 		}
 		if !found {
diff --git a/router.go b/router.go
@@ -211,7 +211,7 @@ func (router *Router) Route(req *Request) (routeMatch *RouteMatch) {
 		controllerName = route.ControllerName
 		if controllerName[0] == ':' {
 			controllerName = strings.ToLower(params[controllerName[1:]][0])
-			if route.ModuleSource.ControllerByName(controllerName, methodName) != nil {
+			if typeOfController = route.ModuleSource.ControllerByName(controllerName, methodName); typeOfController != nil {
 				break
 			}
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ func bindStruct(params *Params, name string, typ reflect.Type) reflect.Value {`
`298`	`298`	`if params.JSON != nil {`
`299`	`299`	`// Try to inject the response as a json into the created result`
`300`	`300`	`if err := json.Unmarshal(params.JSON, resultPointer.Interface()); err != nil {`
`301`		`- binderLog.Warn("bindStruct Unable to unmarshal request", "name", name, "error", err)`
	`301`	`+ binderLog.Error("bindStruct Unable to unmarshal request", "name", name, "error", err,"data", string(params.JSON))`
`302`	`302`	`}`
`303`	`303`	`return result`
`304`	`304`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func ModuleFromPath(path string, addGopathToPath bool) (module *Module) {`
`88`	`88`	`for i := range Modules {`
`89`	`89`	`if addGopathToPath {`
`90`	`90`	`for _, gopath := range gopathList {`
`91`		`- if strings.HasPrefix(gopath+"/src/"+path, Modules[i].Path) {`
	`91`	`+ if strings.HasPrefix(filepath.ToSlash(filepath.Clean(filepath.Join(gopath,"src",path))), Modules[i].Path) {`
`92`	`92`	`module = Modules[i]`
`93`	`93`	`break`
`94`	`94`	`}`
`@@ -164,6 +164,8 @@ func loadModules() {`
`164`	`164`	`if strings.HasPrefix(key, m.ImportPath) {`
`165`	`165`	`moduleLog.Debug("Module called callback", "moduleKey", m.ImportPath, "callbackKey", key)`
`166`	`166`	`callback(m)`
	`167`	`+ found = true`
	`168`	`+ break`
`167`	`169`	`}`
`168`	`170`	`}`
`169`	`171`	`if !found {`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ func (router Router) Route(req Request) (routeMatch *RouteMatch) {`
`211`	`211`	`controllerName = route.ControllerName`
`212`	`212`	`if controllerName[0] == ':' {`
`213`	`213`	`controllerName = strings.ToLower(params[controllerName[1:]][0])`
`214`		`- if route.ModuleSource.ControllerByName(controllerName, methodName) != nil {`
	`214`	`+ if typeOfController = route.ModuleSource.ControllerByName(controllerName, methodName); typeOfController != nil {`
`215`	`215`	`break`
`216`	`216`	`}`
`217`	`217`	`} else {`