3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-24 22:47:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

cache: fix missing parameter (#1005)

Browse source 
* cache: fix missing parameter

* cache: get number of members from NumMembers()
This commit is contained in:
Travis Groth 2020-06-25 13:13:37 -04:00 • committed by GitHub
parent dbd1eac97f
commit b3ee4f534e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cache/memberlist.go vendored
View file

@ -8,6 +8,7 @@ import (
"io" "io"
stdlog "log" stdlog "log"
"strings" "strings"
"time"
"github.com/hashicorp/memberlist" "github.com/hashicorp/memberlist"
"github.com/rs/zerolog" "github.com/rs/zerolog"
@ -53,12 +54,15 @@ func (c *Cache) runMemberList(ctx context.Context) error {
return fmt.Errorf("memberlist: failed to join cluster: %w", err) return fmt.Errorf("memberlist: failed to join cluster: %w", err)
} }
mh.log.Info().Int("joined", joined).Interface("members", mh.memberlist.Members()).Msg("joined nodes") mh.log.Info().Int("contacted", joined).Interface("members", mh.memberlist.Members()).Msg("contacted nodes")
if joined > 1 { if mh.memberlist.NumMembers() > 1 {
mh.log.Error().Msg("multiple cache servers not supported") mh.log.Error().Msg("multiple cache servers not supported")
} }
<-ctx.Done() <-ctx.Done()
mh.memberlist.Leave() err = mh.memberlist.Leave(1 * time.Second)
if err != nil {
mh.log.Error().Err(err).Msg("failed to leave cluster")
}
return mh.memberlist.Shutdown() return mh.memberlist.Shutdown()
} }
@ -66,7 +70,7 @@ func (mh *memberlistHandler) NotifyJoin(node *memberlist.Node) {
mh.log.Debug().Interface("node", node).Msg("node joined") mh.log.Debug().Interface("node", node).Msg("node joined")
go func() { go func() {
if mh.memberlist != nil && len(mh.memberlist.Members()) > 1 { if mh.memberlist != nil && mh.memberlist.NumMembers() > 1 {
mh.log.Error().Msg("detected multiple cache servers, which is not supported") mh.log.Error().Msg("detected multiple cache servers, which is not supported")
} }
}() }()