Skip to content

Fixing the upstream config host #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
d2army wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fixing the upstream config host #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
585b788
Fixing the upstream config host
d2army Dec 22, 2023
c991acd
testing changes
d2army Dec 23, 2023
a99d891
testing again
d2army Dec 26, 2023
170bc08
removing
d2army Dec 26, 2023
28241eb
Logging
d2army Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ res := client.Do(context.Background(), "ping")

### Installation
```
go install github.com/coinbase/redisbetween
go install github.com/d2army/redisbetween
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/coinbase/redisbetween
module github.com/d2army/redisbetween

go 1.13

Expand Down
4 changes: 2 additions & 2 deletions handlers/blocker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"time"

"github.com/coinbase/memcachedbetween/pool"
"github.com/coinbase/redisbetween/messenger"
"github.com/coinbase/redisbetween/redis"
"github.com/d2army/redisbetween/messenger"
"github.com/d2army/redisbetween/redis"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion handlers/blocker_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"
"time"

"github.com/coinbase/redisbetween/redis"
"github.com/d2army/redisbetween/redis"
"github.com/stretchr/testify/assert"
"go.uber.org/zap"
"go.uber.org/zap/zaptest/observer"
Expand Down
2 changes: 1 addition & 1 deletion handlers/blocker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/coinbase/redisbetween/proxy"
"github.com/d2army/redisbetween/proxy"
"github.com/go-redis/redis/v8"
"github.com/stretchr/testify/assert"
)
Expand Down
4 changes: 2 additions & 2 deletions handlers/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"time"

"github.com/coinbase/memcachedbetween/pool"
"github.com/coinbase/redisbetween/messenger"
"github.com/coinbase/redisbetween/redis"
"github.com/d2army/redisbetween/messenger"
"github.com/d2army/redisbetween/redis"

"github.com/DataDog/datadog-go/statsd"
"go.uber.org/zap"
Expand Down
2 changes: 1 addition & 1 deletion handlers/command_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package handlers
import (
"testing"

"github.com/coinbase/redisbetween/redis"
"github.com/d2army/redisbetween/redis"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion handlers/mocks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/DataDog/datadog-go/statsd"
"github.com/coinbase/memcachedbetween/pool"
"github.com/coinbase/redisbetween/redis"
"github.com/d2army/redisbetween/redis"
"github.com/stretchr/testify/assert"
"go.uber.org/zap"
"go.uber.org/zap/zaptest/observer"
Expand Down
2 changes: 1 addition & 1 deletion handlers/reservation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/DataDog/datadog-go/statsd"
"github.com/coinbase/mongobetween/util"
"github.com/coinbase/redisbetween/redis"
"github.com/d2army/redisbetween/redis"
)

type reservation interface {
Expand Down
4 changes: 2 additions & 2 deletions handlers/subscription.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"time"

"github.com/coinbase/memcachedbetween/pool"
"github.com/coinbase/redisbetween/messenger"
"github.com/coinbase/redisbetween/redis"
"github.com/d2army/redisbetween/messenger"
"github.com/d2army/redisbetween/redis"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion handlers/subscription_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package handlers
import (
"testing"

"github.com/coinbase/redisbetween/redis"
"github.com/d2army/redisbetween/redis"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion handlers/subscription_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/coinbase/redisbetween/proxy"
"github.com/d2army/redisbetween/proxy"
"github.com/go-redis/redis/v8"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion messenger/messenger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

"github.com/coinbase/memcachedbetween/pool"
"github.com/coinbase/redisbetween/redis"
"github.com/d2army/redisbetween/redis"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion messenger/messenger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"
"time"

"github.com/coinbase/redisbetween/redis"
"github.com/d2army/redisbetween/redis"
"github.com/stretchr/testify/assert"
"go.uber.org/zap/zaptest"
)
Expand Down
9 changes: 5 additions & 4 deletions proxy/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"github.com/coinbase/mongobetween/util"
"github.com/mediocregopher/radix/v3"

"github.com/coinbase/redisbetween/config"
"github.com/coinbase/redisbetween/handlers"
"github.com/coinbase/redisbetween/redis"
"github.com/d2army/redisbetween/config"
"github.com/d2army/redisbetween/handlers"
"github.com/d2army/redisbetween/redis"

"github.com/DataDog/datadog-go/statsd"
"go.uber.org/zap"
Expand Down Expand Up @@ -244,6 +244,7 @@ func (p *Proxy) ensureNewListenersRemoveOld(newNodes []string) {
if node == p.upstreamConfigHost {
continue
}
p.log.Warn("ensureNewListenersRemoveOld: Removing listener for", zap.String("node", node))
p.removeListener(node)
}

Expand Down Expand Up @@ -389,7 +390,7 @@ func (p *Proxy) healthCheckSingleConnection(key string, wg *sync.WaitGroup) {
if !healthy {
p.log.Warn("Server failed to respond; Deleting the listener", zap.String("server", key))
p.removeListener(key)
if key == p.localConfigHost {
if key == p.upstreamConfigHost {
// add the upstream config host back; we always need to have that minimally
// but hopefully this time, the connection is re-established to the right IP
p.ensureListenerForUpstream(key, "")
Expand Down
2 changes: 1 addition & 1 deletion proxy/proxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"
"time"

"github.com/coinbase/redisbetween/messenger"
"github.com/d2army/redisbetween/messenger"
"github.com/go-redis/redis/v8"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion proxy/test_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"time"

"github.com/DataDog/datadog-go/statsd"
"github.com/coinbase/redisbetween/config"
"github.com/d2army/redisbetween/config"
"github.com/go-redis/redis/v8"
"github.com/stretchr/testify/assert"
"go.uber.org/zap"
Expand Down
4 changes: 2 additions & 2 deletions redisbetween.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"go.uber.org/zap"
"go.uber.org/zap/zapcore"

"github.com/coinbase/redisbetween/config"
"github.com/coinbase/redisbetween/proxy"
"github.com/d2army/redisbetween/config"
"github.com/d2army/redisbetween/proxy"
)

func main() {
Expand Down