unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 1 Actions Packages Projects Releases 259 Wiki Activity

api minor improvements (#1526)

Browse Source 
* api/handler/rpc: unblock all http methods and set Host meta
* api/router/static: add debug log

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2020-04-11 22:21:55 +03:00 committed by GitHub
parent ec80ceb8c2
commit 0a2363b49b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/handler/rpc/rpc.go
View File

@ -100,8 +100,7 @@ func (h *rpcHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return return
} }
// only allow post when we have the router if h.opts.Router == nil && r.Method != "GET" {
if r.Method != "GET" && (h.opts.Router != nil && r.Method != "POST") {
writeError(w, r, errors.MethodNotAllowed("go.micro.api", "method not allowed")) writeError(w, r, errors.MethodNotAllowed("go.micro.api", "method not allowed"))
return return
} }
@ -123,7 +122,8 @@ func (h *rpcHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if !ok { if !ok {
md = make(metadata.Metadata) md = make(metadata.Metadata)
} }
// fill contex with http headers
md["Host"] = r.Host
// merge context with overwrite // merge context with overwrite
cx = metadata.MergeContext(cx, md, true) cx = metadata.MergeContext(cx, md, true)

6
api/router/static/static.go
View File

@ -264,7 +264,9 @@ func (r *staticRouter) endpoint(req *http.Request) (*endpoint, error) {
for _, pathreg := range ep.pathregs { for _, pathreg := range ep.pathregs {
matches, err := pathreg.Match(path, "") matches, err := pathreg.Match(path, "")
if err != nil { if err != nil {
// TODO: log error if logger.V(logger.DebugLevel, logger.DefaultLogger) {
logger.Debugf("api path not match %s != %v", path, pathreg)
}
continue continue
} }
pMatch = true pMatch = true
@ -290,7 +292,7 @@ func (r *staticRouter) endpoint(req *http.Request) (*endpoint, error) {
} }
// no match // no match
return nil, fmt.Errorf("endpoint not found for %v", req) return nil, fmt.Errorf("endpoint not found for %v", req.URL)
} }
func (r *staticRouter) Route(req *http.Request) (*api.Service, error) { func (r *staticRouter) Route(req *http.Request) (*api.Service, error) {