Fix Valid function

go-redsync · Mar 29, 2020 · fb51a7f · fb51a7f
1 parent 367f6e0
commit fb51a7f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/mutex.go b/mutex.go
@@ -89,18 +89,21 @@ func (m *Mutex) Extend() (bool, error) {
 	return true, nil
 }
 
-func (m *Mutex) Valid() bool {
-	n := m.actOnPoolsAsync(func(pool Pool) bool {
+func (m *Mutex) Valid() (bool, error) {
+	n, err := m.actOnPoolsAsync(func(pool Pool) (bool, error) {
 		return m.valid(pool)
 	})
-	return n >= m.quorum
+	return n >= m.quorum, err
 }
 
-func (m *Mutex) valid(pool Pool) bool {
+func (m *Mutex) valid(pool Pool) (bool, error) {
 	conn := pool.Get()
 	defer conn.Close()
 	reply, err := redis.String(conn.Do("GET", m.name))
-	return err == nil && m.value == reply
+	if err != nil {
+		return false, err
+	}
+	return m.value == reply, nil
 }
 
 func genValue() (string, error) {

diff --git a/mutex_test.go b/mutex_test.go
@@ -131,7 +131,11 @@ func TestValid(t *testing.T) {
 	}
 	assertAcquired(t, pools, mutex1)
 
-	if !mutex1.Valid() {
+	ok, err := mutex1.Valid()
+	if err != nil {
+		t.Fatalf("Expected err != nil, got: %q", err)
+	}
+	if !ok {
 		t.Fatalf("Expected a valid mutex")
 	}