Skip to content

Commit 5c486cf

Browse files
authored
Merge pull request #2335 from monkey92t/issue_2319
fix: hook.process.fn should return error instead of cmd.SetErr().
2 parents 52af8ba + 0358ca4 commit 5c486cf

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
*.rdb
2-
testdata/*/
2+
testdata/*
33
.idea/

cluster_commands.go

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ func (c *ClusterClient) DBSize(ctx context.Context) *IntCmd {
1818
atomic.AddInt64(&size, n)
1919
return nil
2020
})
21+
2122
if err != nil {
22-
cmd.SetErr(err)
23-
} else {
24-
cmd.val = size
23+
return err
2524
}
25+
26+
cmd.val = size
2627
return nil
2728
})
2829
return cmd
@@ -46,10 +47,8 @@ func (c *ClusterClient) ScriptLoad(ctx context.Context, script string) *StringCm
4647

4748
return nil
4849
})
49-
if err != nil {
50-
cmd.SetErr(err)
51-
}
52-
return nil
50+
51+
return err
5352
})
5453
return cmd
5554
}
@@ -60,10 +59,8 @@ func (c *ClusterClient) ScriptFlush(ctx context.Context) *StatusCmd {
6059
err := c.ForEachShard(ctx, func(ctx context.Context, shard *Client) error {
6160
return shard.ScriptFlush(ctx).Err()
6261
})
63-
if err != nil {
64-
cmd.SetErr(err)
65-
}
66-
return nil
62+
63+
return err
6764
})
6865
return cmd
6966
}
@@ -98,11 +95,12 @@ func (c *ClusterClient) ScriptExists(ctx context.Context, hashes ...string) *Boo
9895

9996
return nil
10097
})
98+
10199
if err != nil {
102-
cmd.SetErr(err)
103-
} else {
104-
cmd.val = result
100+
return err
105101
}
102+
103+
cmd.val = result
106104
return nil
107105
})
108106
return cmd

0 commit comments

Comments
 (0)