unistack-org/micro
4
0
Fork 2
Code Issues 21 Pull Requests Actions Packages Projects Releases 322 Wiki Activity

Merge pull request #45 from micro/metadata

Browse Source 
Move context to metadata
This commit is contained in:
Asim
2016-01-28 18:30:53 +00:00
parent 1cc621e2d6 b9f4e17d4c
commit 6b7f2f3bd3
13 changed files with 56 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/rpc_server.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/micro/go-micro/broker"
"github.com/micro/go-micro/codec"
c "github.com/micro/go-micro/context"
"github.com/micro/go-micro/metadata"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/transport"
@@ -79,7 +79,7 @@ func (s *rpcServer) accept(sock transport.Socket) {
}
delete(hdr, "Content-Type")
ctx := c.WithMetadata(context.Background(), hdr)
ctx := metadata.NewContext(context.Background(), hdr)
// TODO: needs better error handling
if err := s.rpc.serveRequest(ctx, codec, ct); err != nil {

4
server/subscriber.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/micro/go-micro/broker"
"github.com/micro/go-micro/codec"
c "github.com/micro/go-micro/context"
"github.com/micro/go-micro/metadata"
"github.com/micro/go-micro/registry"
"golang.org/x/net/context"
)
@@ -175,7 +175,7 @@ func (s *rpcServer) createSubHandler(sb *subscriber, opts Options) broker.Handle
hdr[k] = v
}
delete(hdr, "Content-Type")
ctx := c.WithMetadata(context.Background(), hdr)
ctx := metadata.NewContext(context.Background(), hdr)
for i := 0; i < len(sb.handlers); i++ {
handler := sb.handlers[i]