Merge pull request #1 from Hedayet/Hedayet-patch-1

Exec the cancel returned by context.WithTimeout
pressly · Mar 30, 2017 · 739fab2 · 739fab2
2 parents 4954b83 + e5f3762
commit 739fab2
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/timeout.go b/timeout.go
@@ -22,17 +22,20 @@ func (s *timeoutManager) Open() (err error)  { return s.chain.Open() }
 func (s *timeoutManager) Close() (err error) { return s.chain.Close() }
 
 func (s *timeoutManager) Put(ctx context.Context, key string, val []byte) (err error) {
-	ctx, _ = context.WithTimeout(ctx, s.timeout)
+	ctx, cancel = context.WithTimeout(ctx, s.timeout)
+	defer cancel()
 	return s.chain.Put(ctx, key, val)
 }
 
 func (s *timeoutManager) Get(ctx context.Context, key string) (data []byte, err error) {
-	ctx, _ = context.WithTimeout(ctx, s.timeout)
+	ctx, cancel = context.WithTimeout(ctx, s.timeout)
+	defer cancel()
 	return s.chain.Get(ctx, key)
 }
 
 func (s *timeoutManager) Del(ctx context.Context, key string) (err error) {
-	ctx, _ = context.WithTimeout(ctx, s.timeout)
+	ctx, cancel = context.WithTimeout(ctx, s.timeout)
+	defer cancel()
 	return s.chain.Del(ctx, key)
 
 }