chore: unify naming for node related types
This commit is contained in:
parent
bbee40ec98
commit
4d44012d06
12 changed files with 72 additions and 53 deletions
|
|
@ -29,10 +29,10 @@ func New(state *state.RuntimeState, config config.NodeConfig) *Role {
|
|||
func (r *Role) Join(bootstrap string) error {
|
||||
masters := make(map[string]struct{})
|
||||
for _, node := range r.state.Registry.ByRole(types.MasterRole) {
|
||||
if node.Name == r.state.Self.Name {
|
||||
if node.Hostname == r.state.Self.Hostname {
|
||||
continue
|
||||
}
|
||||
masters[node.Address] = struct{}{}
|
||||
masters[node.Endpoint] = struct{}{}
|
||||
}
|
||||
if bootstrap != "" {
|
||||
masters[bootstrap] = struct{}{}
|
||||
|
|
@ -69,10 +69,10 @@ func (r *Role) Leave() error {
|
|||
|
||||
sent := false
|
||||
for _, m := range masters {
|
||||
logger := log.With().Str("name", m.Name).Logger()
|
||||
logger := log.With().Str("name", m.Hostname).Logger()
|
||||
logger.Debug().Msg("sending leave message")
|
||||
|
||||
_, err := client.Post[any](m.Address, types.PathMasterLeave, r.state.Self)
|
||||
_, err := client.Post[any](m.Endpoint, types.PathMasterLeave, r.state.Self)
|
||||
if err != nil {
|
||||
logger.Debug().Err(err).Msg("unable to send leave message")
|
||||
continue
|
||||
|
|
@ -114,10 +114,10 @@ func (r *Role) keepaliveFunc(ctx context.Context) func() {
|
|||
|
||||
sent := false
|
||||
for _, m := range masters {
|
||||
logger := log.With().Str("name", m.Name).Logger()
|
||||
logger := log.With().Str("name", m.Hostname).Logger()
|
||||
logger.Debug().Msg("sending keepalive packet")
|
||||
|
||||
if _, err := client.Post[any](m.Address, types.PathMasterKeepalive, r.state.Self); err != nil {
|
||||
if _, err := client.Post[any](m.Endpoint, types.PathMasterKeepalive, r.state.Self); err != nil {
|
||||
continue
|
||||
} else {
|
||||
logger.Debug().Msg("keepalive packet sent")
|
||||
|
|
@ -151,7 +151,7 @@ func (r *Role) onJoin(node types.Node) (bool, error) {
|
|||
}
|
||||
|
||||
func (r *Role) onLeave(node types.Node) (bool, error) {
|
||||
if err := r.state.Registry.RemoveNode(node.Name); err != nil {
|
||||
if err := r.state.Registry.RemoveNode(node.Hostname); err != nil {
|
||||
return false, err
|
||||
}
|
||||
return true, nil
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue