fcrozat/distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #675 from RichardScothern/fix-ctx

Browse Source 
Pass correct context into tracer
This commit is contained in:
Stephen Day 2015-06-30 11:18:51 -07:00
commit c1423aa2aa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
registry/storage/driver/base/base.go
View File

@ -64,7 +64,7 @@ func (base *Base) GetContent(ctx context.Context, path string) ([]byte, error) {
// PutContent wraps PutContent of underlying storage driver. // PutContent wraps PutContent of underlying storage driver.
func (base *Base) PutContent(ctx context.Context, path string, content []byte) error { func (base *Base) PutContent(ctx context.Context, path string, content []byte) error {
ctx, done := context.WithTrace(context.Background()) ctx, done := context.WithTrace(ctx)
defer done("%s.PutContent(%q)", base.Name(), path) defer done("%s.PutContent(%q)", base.Name(), path)
if !storagedriver.PathRegexp.MatchString(path) { if !storagedriver.PathRegexp.MatchString(path) {
@ -76,7 +76,7 @@ func (base *Base) PutContent(ctx context.Context, path string, content []byte) e
// ReadStream wraps ReadStream of underlying storage driver. // ReadStream wraps ReadStream of underlying storage driver.
func (base *Base) ReadStream(ctx context.Context, path string, offset int64) (io.ReadCloser, error) { func (base *Base) ReadStream(ctx context.Context, path string, offset int64) (io.ReadCloser, error) {
ctx, done := context.WithTrace(context.Background()) ctx, done := context.WithTrace(ctx)
defer done("%s.ReadStream(%q, %d)", base.Name(), path, offset) defer done("%s.ReadStream(%q, %d)", base.Name(), path, offset)
if offset < 0 { if offset < 0 {