Merge branch 'master' of github.com:pacedotdev/oto

matryer · matryer · commit 55a68aa55457 · 2020-09-30T16:15:11.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -15,5 +15,4 @@
 oto
 .DS_Store
 dist
-example/swift/SwiftCLIExample/SwiftCLIExample.xcodeproj/project.xcworkspace/xcuserdata/matryer.xcuserdatad/UserInterfaceState.xcuserstate
-example/swift/SwiftCLIExample/SwiftCLIExample.xcodeproj/project.xcworkspace/xcuserdata/matryer.xcuserdatad/UserInterfaceState.xcuserstate
+example/swift/SwiftCLIExample/SwiftCLIExample.xcodeproj/project.xcworkspace/xcuserdata/
diff --git a/example/swift/SwiftCLIExample/SwiftCLIExample.xcodeproj/project.xcworkspace/xcuserdata/matryer.xcuserdatad/UserInterfaceState.xcuserstate b/example/swift/SwiftCLIExample/SwiftCLIExample.xcodeproj/project.xcworkspace/xcuserdata/matryer.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/otohttp/templates/server.go.plush b/otohttp/templates/server.go.plush
@@ -43,8 +43,7 @@ func (s *<%= camelize_down(service.Name) %>Server) handle<%= method.Name %>(w ht
 	}
 	response, err := s.<%= camelize_down(service.Name) %>.<%= method.Name %>(r.Context(), request)
 	if err != nil {
-		log.Println("TODO: oto service error:", err)
-		http.Error(w, err.Error(), http.StatusInternalServerError)
+		s.server.OnErr(w, r, err)
 		return
 	}
 	if err := otohttp.Encode(w, r, http.StatusOK, response); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,7 @@ func (s *<%= camelize_down(service.Name) %>Server) handle<%= method.Name %>(w ht`
`43`	`43`	`}`
`44`	`44`	`response, err := s.<%= camelize_down(service.Name) %>.<%= method.Name %>(r.Context(), request)`
`45`	`45`	`if err != nil {`
`46`		`- log.Println("TODO: oto service error:", err)`
`47`		`- http.Error(w, err.Error(), http.StatusInternalServerError)`
	`46`	`+ s.server.OnErr(w, r, err)`
`48`	`47`	`return`
`49`	`48`	`}`
`50`	`49`	`if err := otohttp.Encode(w, r, http.StatusOK, response); err != nil {`