Merge pull request #97 from unistack-org/master

merge master
Merge pull request #96 from unistack-org/codec
2022-02-01 11:23:02 +03:00 · 2022-02-01 11:22:39 +03:00 · 2022-02-01 11:22:18 +03:00 · 2022-01-31 20:24:07 +03:00 · 2022-01-31 17:22:15 +00:00
3 changed files with 9 additions and 8 deletions
--- a/go.mod
+++ b/go.mod
@@ -3,6 +3,6 @@ module go.unistack.org/micro-server-http/v3
 go 1.16

 require (
-	go.unistack.org/micro/v3 v3.8.20
+	go.unistack.org/micro/v3 v3.8.21
 	golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba
 )
--- a/go.sum
+++ b/go.sum
@@ -69,8 +69,8 @@ github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQ
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.unistack.org/micro-proto/v3 v3.2.1 h1:z7+V97LcAwMbBiYStmf8b6fFk2UPJTzni+rxNqk4NrI=
 go.unistack.org/micro-proto/v3 v3.2.1/go.mod h1:ZltVWNECD5yK+40+OCONzGw4OtmSdTpVi8/KFgo9dqM=
-go.unistack.org/micro/v3 v3.8.20 h1:ZKqkb1IY3sNLgcEN3fxOkVgwxBP3vz8m+p297qLxx9w=
-go.unistack.org/micro/v3 v3.8.20/go.mod h1:aBOCQ6SkAwKMRI7Q1CIsQA2S88ibyJfweJZlT1M2qpE=
+go.unistack.org/micro/v3 v3.8.21 h1:8vYxtIlPnCBZ888BrQSP6+b0CFQcn5FiaqDpI5XqorQ=
+go.unistack.org/micro/v3 v3.8.21/go.mod h1:aBOCQ6SkAwKMRI7Q1CIsQA2S88ibyJfweJZlT1M2qpE=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
--- a/handler.go
+++ b/handler.go
@@ -97,11 +97,6 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		h.errorHandler(ctx, nil, w, r, fmt.Errorf("path must starts with /"), http.StatusBadRequest)
 		return
 	}
-	cf, err := h.newCodec(ct)
-	if err != nil {
-		h.errorHandler(ctx, nil, w, r, err, http.StatusBadRequest)
-		return
-	}

 	matches := make(map[string]interface{})

@@ -166,6 +161,12 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}

+	cf, err := h.newCodec(ct)
+	if err != nil {
+		h.errorHandler(ctx, nil, w, r, err, http.StatusBadRequest)
+		return
+	}
+
 	var argv, replyv reflect.Value

 	// Decode the argument value.
Author	SHA1	Message	Date
Vasiliy Tolstov	c2f178001c	Merge pull request #97 from unistack-org/master merge master	2022-02-01 11:23:02 +03:00
Vasiliy Tolstov	ffe5f1c9be	Merge pull request #96 from unistack-org/codec lazy codec init	2022-02-01 11:22:39 +03:00
Vasiliy Tolstov	416d494e50	lazy codec init Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2022-02-01 11:22:18 +03:00
Vasiliy Tolstov	7dd1dfbff6	Merge pull request #95 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.21 Bump go.unistack.org/micro/v3 from 3.8.20 to 3.8.21	2022-01-31 20:24:07 +03:00
dependabot[bot]	e11dc06067	Bump go.unistack.org/micro/v3 from 3.8.20 to 3.8.21 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.20 to 3.8.21. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.20...v3.8.21) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-31 17:22:15 +00:00