From d2b1730439b9b0741773a8cf1caa9e90192aab6e Mon Sep 17 00:00:00 2001 From: NotZippy Date: Tue, 4 Apr 2017 17:17:23 -0700 Subject: [PATCH] Makes it so harness can bootstrap using the new GoRequest / response wrappers --- harness/build.go | 4 ++-- harness/harness.go | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/harness/build.go b/harness/build.go index 386a66c..cd0d80b 100755 --- a/harness/build.go +++ b/harness/build.go @@ -286,7 +286,7 @@ func calcImportAliases(src *SourceInfo) map[string]string { } func addAlias(aliases map[string]string, importPath, pkgName string) { - alias, ok := aliases[importPath] + alias, ok := aliases[importPath] if ok { return } @@ -297,7 +297,7 @@ func addAlias(aliases map[string]string, importPath, pkgName string) { func makePackageAlias(aliases map[string]string, pkgName string) string { i := 0 alias := pkgName - for containsValue(aliases, alias) { + for containsValue(aliases, alias) || alias=="revel" { alias = fmt.Sprintf("%s%d", pkgName, i) i++ } diff --git a/harness/harness.go b/harness/harness.go index ccb877e..cc92bc6 100644 --- a/harness/harness.go +++ b/harness/harness.go @@ -47,7 +47,10 @@ type Harness struct { proxy *httputil.ReverseProxy } -func renderError(w http.ResponseWriter, r *http.Request, err error) { +func renderError(iw http.ResponseWriter, ir *http.Request, err error) { + r,w := &revel.GORequest{Goheader:&revel.GOHeader{}}, &revel.GOResponse{Goheader:&revel.GOHeader{}} + r.Set(ir) + w.Set(iw) req, resp := revel.NewRequest(r), revel.NewResponse(w) c := revel.NewController(req, resp) c.RenderError(err).Apply(req, resp)