[patch] bugfix of race condition (#77)

Signed-off-by: kpango <i.can.feel.gravity@gmail.com>
kpango · Jul 11, 2019 · 8db1e54 · 8db1e54
1 parent da3d7c0
commit 8db1e54
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/gache.go b/gache.go
@@ -429,8 +429,10 @@ func Read(r io.Reader) error {
 
 // Stop kills expire daemon
 func (g *gache) Stop() {
-	if cancel := g.cancel.Load().(context.CancelFunc); cancel != nil {
-		cancel()
+	if c := g.cancel.Load(); c != nil {
+		if cancel, ok := c.(context.CancelFunc); ok && cancel != nil {
+			cancel()
+		}
 	}
 }
 

diff --git a/go.mod b/go.mod
@@ -13,5 +13,5 @@ require (
 	github.com/kpango/fastime v1.0.14
 	github.com/kpango/glg v1.4.5
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	golang.org/x/sync v0.0.0-20190423024810-112230192c58
+	golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
 )
diff --git a/go.sum b/go.sum
@@ -43,6 +43,5 @@ github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9/go.mod h1:JwIa
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=