Merge pull request #17 from el-yurchito/master

Optional Hooks list

Author: nvorobev

CHANGELOG.md

@@ -1,3 +1,7 @@
+## v3.1.0 (2023-06-13)
+
+- Edit optional Hooks to HAConfig
+
 ## v3.0.0 (2023-04-17)
 
 - Update go-redis library to v9 (v9.0.3)
@@ -34,4 +38,4 @@
 
 ## v1.0.0 (2020-02-26)
 
-- Initial public version
+- Initial public version

ha_conn_factory.go

@@ -26,6 +26,7 @@ type HAConfig struct {
 	Password         string         // the password of the master
 	ReadonlyPassword string         // the passsword of slaves
 	Options          *redis.Options // redis options
+	Hooks            []redis.Hook   // optional list of redis hooks
 	PollType         int            // the slave polling type
 
 	AutoEjectHost      bool          // eject the failure host or not
@@ -85,7 +86,7 @@ func NewHAConnFactory(cfg *HAConfig) (*HAConnFactory, error) {
 	options.Addr = cfg.Master
 	options.Password = cfg.Password
 
-	factory.master = newClient(redis.NewClient(&options), 0)
+	factory.master = newClient(redis.NewClient(&options), 0, cfg.Hooks)
 	factory.slaves = newClientPool(cfg)
 	return factory, nil
 }
@@ -150,14 +151,17 @@ func (cfg *HAConfig) init() error {
 	return nil
 }
 
-func newClient(redisCli *redis.Client, weight int64) *client {
+func newClient(redisCli *redis.Client, weight int64, hooks []redis.Hook) *client {
 	c := &client{
 		redisCli: redisCli,
 		weight:   weight,
 
 		failureCount:  0,
 		lastEjectTime: 0,
 	}
+	for _, hook := range hooks {
+		c.redisCli.AddHook(hook)
+	}
 	return c
 }
 
@@ -193,7 +197,7 @@ func newClientPool(cfg *HAConfig) *clientPool {
 		slaveOptions.Addr = slave
 		slaveOptions.Password = slavePassword
 		redisCli := redis.NewClient(&slaveOptions)
-		cli := newClient(redisCli, cfg.weights[i])
+		cli := newClient(redisCli, cfg.weights[i], cfg.Hooks)
 		if cfg.AutoEjectHost && len(cfg.Slaves) > 1 {
 			redisCli.AddHook(newFailureHook(cli))
 		}