Skip to content

Refactor registry to remove mutex dependency #14

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
awoodbeck wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor registry to remove mutex dependency #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions definition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ func noClustering(log ClusterLogger) (*connectionServer, *registry) {
nodeID := NodeID(0)
clusterSpec := &ClusterSpec{
Nodes: []*NodeDefinition{
&NodeDefinition{
{
ID: nodeID,
Address: "127.0.0.1:65530",
},
Expand Down Expand Up @@ -303,7 +303,7 @@ func createFromSpec(spec *ClusterSpec, thisNode NodeID, log ClusterLogger) (*con

log = resolveLog(log)

errs := []string{}
var errs []string

if spec.Nodes == nil || len(spec.Nodes) == 0 {
errs = append(errs, "no nodes specified in cluster definition")
Expand Down
8 changes: 4 additions & 4 deletions listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,15 +265,15 @@ func (ic *incomingConnection) sslHandshake() error {
}
tlsConfig := ic.nodeListener.connectionServer.Cluster.tlsConfig(ic.server.ID)

tls := tls.Server(ic.conn, tlsConfig)
tlsSrv := tls.Server(ic.conn, tlsConfig)
ic.Tracef("Node %d listener made the tlsConn, handshaking", ic.server.ID)

err := tls.Handshake()
err := tlsSrv.Handshake()
if err != nil {
return err
}

ic.tls = tls
ic.tls = tlsSrv
ic.output = gob.NewEncoder(ic.tls)
ic.input = gob.NewDecoder(ic.tls)

Expand Down Expand Up @@ -387,7 +387,7 @@ func (ic *incomingConnection) handleIncomingMessages() {
ic.resetConnectionDeadline(DeadlineInterval)

// Send our registry claims.
var claims internal.ClusterMessage = ic.connectionServer.registry.generateAllNodeClaims()
var claims internal.ClusterMessage = ic.connectionServer.registry.getAllNodeClaims()
err = ic.output.Encode(&claims)
if err != nil {
ic.Errorf("Sending registry claims: %s", err)
Expand Down
2 changes: 1 addition & 1 deletion mailbox.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@ func (nm noMailbox) onCloseNotify(target *Address) {
_ = target.Send(MailboxClosed(nm.MailboxID))
}

func (nm noMailbox) removeNotify(target *Address) {}
func (nm noMailbox) removeNotify(_ *Address) {}

func (nm noMailbox) getMailboxID() MailboxID {
return nm.MailboxID
Expand Down
2 changes: 1 addition & 1 deletion node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ func (nc *nodeConnection) handleIncomingMessages() {
nc.resetConnectionDeadline(DeadlineInterval)

// Send our registry claims.
var claims internal.ClusterMessage = nc.connectionServer.registry.generateAllNodeClaims()
var claims internal.ClusterMessage = nc.connectionServer.registry.getAllNodeClaims()
err = nc.output.Encode(&claims)
if err != nil {
nc.Errorf("Sending registry claims: %s", err)
Expand Down
Loading