Run of fresh-releases for golang-github-fzambia-sentinel

Merge these changes:

Summary

Merged new upstream version: 1.1.0 (was: 1.0.0).

Diff

Branch: main

diff --git a/README.md b/README.md
index f3b0bdd..f83afc0 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,36 @@ go-sentinel
 
 Redis Sentinel support for [redigo](https://github.com/gomodule/redigo) library.
 
-**API is unstable and can change at any moment** – use with tools like Glide, Godep etc.
-
 Documentation
 -------------
 
 - [API Reference](http://godoc.org/github.com/FZambia/sentinel)
 
+Alternative solution
+--------------------
+
+You can alternatively configure Haproxy between your application and Redis to proxy requests to Redis master instance if you only need HA:
+
+```
+listen redis
+    server redis-01 127.0.0.1:6380 check port 6380 check inter 2s weight 1 inter 2s downinter 5s rise 10 fall 2 on-marked-down shutdown-sessions on-marked-up shutdown-backup-sessions
+    server redis-02 127.0.0.1:6381 check port 6381 check inter 2s weight 1 inter 2s downinter 5s rise 10 fall 2 backup
+    bind *:6379
+    mode tcp
+    option tcpka
+    option tcplog
+    option tcp-check
+    tcp-check send PING\r\n
+    tcp-check expect string +PONG
+    tcp-check send info\ replication\r\n
+    tcp-check expect string role:master
+    tcp-check send QUIT\r\n
+    tcp-check expect string +OK
+    balance roundrobin
+```
+
+This way you don't need to use this library.
+
 License
 -------
 
diff --git a/debian/changelog b/debian/changelog
index 6805ad0..7ef9423 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+golang-github-fzambia-sentinel (1.1.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Mon, 14 Mar 2022 19:57:33 -0000
+
 golang-github-fzambia-sentinel (1.0.0-2) unstable; urgency=medium
 
   * Team Upload
diff --git a/sentinel.go b/sentinel.go
index d36afa3..8dd35a3 100644
--- a/sentinel.go
+++ b/sentinel.go
@@ -222,11 +222,6 @@ func (s *Sentinel) doUntilSuccess(f func(redis.Conn) (interface{}, error)) (inte
 		if err != nil {
 			lastErr = err
 			s.mu.Lock()
-			pool, ok := s.pools[addr]
-			if ok {
-				pool.Close()
-				delete(s.pools, addr)
-			}
 			s.putToBottom(addr)
 			s.mu.Unlock()
 			continue

Branch: pristine-tar

diff --git a/golang-github-fzambia-sentinel_1.1.0.orig.tar.gz.delta b/golang-github-fzambia-sentinel_1.1.0.orig.tar.gz.delta
new file mode 100644
index 0000000..a732666
Binary files /dev/null and b/golang-github-fzambia-sentinel_1.1.0.orig.tar.gz.delta differ
diff --git a/golang-github-fzambia-sentinel_1.1.0.orig.tar.gz.id b/golang-github-fzambia-sentinel_1.1.0.orig.tar.gz.id
new file mode 100644
index 0000000..6806b1f
--- /dev/null
+++ b/golang-github-fzambia-sentinel_1.1.0.orig.tar.gz.id
@@ -0,0 +1 @@
+9085053494b7eee52c4224945f101d59349724e6

Branch: upstream

Tag: upstream/1.1.0
diff --git a/README.md b/README.md
index f3b0bdd..f83afc0 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,36 @@ go-sentinel
 
 Redis Sentinel support for [redigo](https://github.com/gomodule/redigo) library.
 
-**API is unstable and can change at any moment** – use with tools like Glide, Godep etc.
-
 Documentation
 -------------
 
 - [API Reference](http://godoc.org/github.com/FZambia/sentinel)
 
+Alternative solution
+--------------------
+
+You can alternatively configure Haproxy between your application and Redis to proxy requests to Redis master instance if you only need HA:
+
+```
+listen redis
+    server redis-01 127.0.0.1:6380 check port 6380 check inter 2s weight 1 inter 2s downinter 5s rise 10 fall 2 on-marked-down shutdown-sessions on-marked-up shutdown-backup-sessions
+    server redis-02 127.0.0.1:6381 check port 6381 check inter 2s weight 1 inter 2s downinter 5s rise 10 fall 2 backup
+    bind *:6379
+    mode tcp
+    option tcpka
+    option tcplog
+    option tcp-check
+    tcp-check send PING\r\n
+    tcp-check expect string +PONG
+    tcp-check send info\ replication\r\n
+    tcp-check expect string role:master
+    tcp-check send QUIT\r\n
+    tcp-check expect string +OK
+    balance roundrobin
+```
+
+This way you don't need to use this library.
+
 License
 -------
 
diff --git a/sentinel.go b/sentinel.go
index d36afa3..8dd35a3 100644
--- a/sentinel.go
+++ b/sentinel.go
@@ -222,11 +222,6 @@ func (s *Sentinel) doUntilSuccess(f func(redis.Conn) (interface{}, error)) (inte
 		if err != nil {
 			lastErr = err
 			s.mu.Lock()
-			pool, ok := s.pools[addr]
-			if ok {
-				pool.Close()
-				delete(s.pools, addr)
-			}
 			s.putToBottom(addr)
 			s.mu.Unlock()
 			continue

Publish Blockers

  • ☑ run was successful
  • ☑ package has not been removed from the archive
  • ☑ command has not changed
  • ☒ not yet reviewed, but review needed
  • ☑ 0 publish attempts so far.not currently attempting to back off
  • ☑ proposals not currently being rate-limited for maintainer team+pkg-go@tracker.debian.org
  • ☑ change set 3212c434-165f-4d1b-bc2d-471de7fce2ee is ready

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-releases golang-github-fzambia-sentinel-dev

Lintian Result

Full worker log Full build log