mirror of
https://github.com/ipfs/kubo.git
synced 2026-02-23 03:17:43 +08:00
- updated go-ctxgroup and goprocess ctxgroup: AddChildGroup was changed to AddChild. Used in two files: - p2p/net/mock/mock_net.go - routing/dht/dht.go - updated context from hg repo to git prev. commit in hg was ad01a6fcc8a19d3a4478c836895ffe883bd2ceab. (context: make parentCancelCtx iterative) represents commit 84f8955a887232b6308d79c68b8db44f64df455c in git repo - updated context to master (b6fdb7d8a4ccefede406f8fe0f017fb58265054c) Aaron Jacobs (2): net/context: Don't accept a context in the DoSomethingSlow example. context: Be clear that users must cancel the result of WithCancel. Andrew Gerrand (1): go.net: use golang.org/x/... import paths Bryan C. Mills (1): net/context: Don't leak goroutines in Done example. Damien Neil (1): context: fix removal of cancelled timer contexts from parent David Symonds (2): context: Fix WithValue example code. net: add import comments. Sameer Ajmani (1): context: fix TestAllocs to account for ints in interfaces
39 lines
986 B
Go
39 lines
986 B
Go
package eventlog
|
|
|
|
import (
|
|
"errors"
|
|
|
|
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
|
|
)
|
|
|
|
type key int
|
|
|
|
const metadataKey key = 0
|
|
|
|
// ContextWithLoggable returns a derived context which contains the provided
|
|
// Loggable. Any Events logged with the derived context will include the
|
|
// provided Loggable.
|
|
func ContextWithLoggable(ctx context.Context, l Loggable) context.Context {
|
|
existing, err := MetadataFromContext(ctx)
|
|
if err != nil {
|
|
// context does not contain meta. just set the new metadata
|
|
child := context.WithValue(ctx, metadataKey, Metadata(l.Loggable()))
|
|
return child
|
|
}
|
|
|
|
merged := DeepMerge(existing, l.Loggable())
|
|
child := context.WithValue(ctx, metadataKey, merged)
|
|
return child
|
|
}
|
|
|
|
func MetadataFromContext(ctx context.Context) (Metadata, error) {
|
|
value := ctx.Value(metadataKey)
|
|
if value != nil {
|
|
metadata, ok := value.(Metadata)
|
|
if ok {
|
|
return metadata, nil
|
|
}
|
|
}
|
|
return nil, errors.New("context contains no metadata")
|
|
}
|