Skip to content

[18.03] Fix linting issues #2700

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

Merged
cyli merged 1 commit into from
Jul 26, 2018
Merged

[18.03] Fix linting issues #2700

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
10 changes: 5 additions & 5 deletions agent/agent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,27 +117,27 @@ func TestHandleSessionMessageNetworkManagerChanges(t *testing.T) {
var messages = []*api.SessionMessage{
{
Managers: []*api.WeightedPeer{
{&api.Peer{NodeID: "node1", Addr: "10.0.0.1"}, 1.0}},
{Peer: &api.Peer{NodeID: "node1", Addr: "10.0.0.1"}, Weight: 1.0}},
NetworkBootstrapKeys: []*api.EncryptionKey{{}},
},
{
Managers: []*api.WeightedPeer{
{&api.Peer{NodeID: "node1", Addr: ""}, 1.0}},
{Peer: &api.Peer{NodeID: "node1", Addr: ""}, Weight: 1.0}},
NetworkBootstrapKeys: []*api.EncryptionKey{{}},
},
{
Managers: []*api.WeightedPeer{
{&api.Peer{NodeID: "node1", Addr: "10.0.0.1"}, 1.0}},
{Peer: &api.Peer{NodeID: "node1", Addr: "10.0.0.1"}, Weight: 1.0}},
NetworkBootstrapKeys: nil,
},
{
Managers: []*api.WeightedPeer{
{&api.Peer{NodeID: "", Addr: "10.0.0.1"}, 1.0}},
{Peer: &api.Peer{NodeID: "", Addr: "10.0.0.1"}, Weight: 1.0}},
NetworkBootstrapKeys: []*api.EncryptionKey{{}},
},
{
Managers: []*api.WeightedPeer{
{&api.Peer{NodeID: "node1", Addr: "10.0.0.1"}, 0.0}},
{Peer: &api.Peer{NodeID: "node1", Addr: "10.0.0.1"}, Weight: 0.0}},
NetworkBootstrapKeys: []*api.EncryptionKey{{}},
},
}
Expand Down
4 changes: 2 additions & 2 deletions manager/dispatcher/dispatcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ func (d *Dispatcher) markNodesUnknown(ctx context.Context) error {

expireFunc := func() {
log := log.WithField("node", nodeID)
log.Info(`heartbeat expiration for node %s in state "unknown"`, nodeID)
log.Infof(`heartbeat expiration for node %s in state "unknown"`, nodeID)
if err := d.markNodeNotReady(nodeID, api.NodeStatus_DOWN, `heartbeat failure for node in "unknown" state`); err != nil {
log.WithError(err).Error(`failed deregistering node after heartbeat expiration for node in "unknown" state`)
}
Expand Down Expand Up @@ -535,7 +535,7 @@ func (d *Dispatcher) register(ctx context.Context, nodeID string, description *a
}

expireFunc := func() {
log.G(ctx).Debug("heartbeat expiration for worker %s, setting worker status to NodeStatus_DOWN ", nodeID)
log.G(ctx).Debugf("heartbeat expiration for worker %s, setting worker status to NodeStatus_DOWN ", nodeID)
if err := d.markNodeNotReady(nodeID, api.NodeStatus_DOWN, "heartbeat failure"); err != nil {
log.G(ctx).WithError(err).Errorf("failed deregistering node after heartbeat expiration")
}
Expand Down