Skip to content

Commit ddb4539

Browse files
cylicyli
authored
Merge pull request #2345 from simonferquel/update-logrus
Update logrus to v1.0.1 - with networkd, runc, containerd masters
2 parents 163a8c2 + a214f69 commit ddb4539

File tree

570 files changed

+71908
-24978
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

570 files changed

+71908
-24978
lines changed

‎agent/exec/containerd/adapter.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"syscall"
1010
"time"
1111

12-
"github.com/Sirupsen/logrus"
1312
"github.com/containerd/containerd"
13+
"github.com/containerd/containerd/errdefs"
1414
"github.com/docker/docker/pkg/signal"
1515
"github.com/docker/swarmkit/agent/exec"
1616
"github.com/docker/swarmkit/api"
@@ -19,9 +19,8 @@ import (
1919
gogotypes "github.com/gogo/protobuf/types"
2020
"github.com/opencontainers/runtime-spec/specs-go"
2121
"github.com/pkg/errors"
22+
"github.com/sirupsen/logrus"
2223
"golang.org/x/net/context"
23-
"google.golang.org/grpc"
24-
"google.golang.org/grpc/codes"
2524
)
2625

2726
var (
@@ -77,7 +76,7 @@ func newContainerAdapter(client *containerd.Client, task *api.Task, secrets exec
7776
func (c *containerAdapter) reattach(ctx context.Context) error {
7877
container, err := c.client.LoadContainer(ctx, c.name)
7978
if err != nil {
80-
if grpc.Code(err) == codes.NotFound {
79+
if errdefs.IsNotFound(err) {
8180
c.log(ctx).Debug("reattach: container not found")
8281
return nil
8382
}
@@ -97,7 +96,7 @@ func (c *containerAdapter) reattach(ctx context.Context) error {
9796

9897
task, err := container.Task(ctx, containerd.WithAttach(devNull, os.Stdout, os.Stderr))
9998
if err != nil {
100-
if err == containerd.ErrNoRunningTask {
99+
if errdefs.IsNotFound(err) {
101100
c.log(ctx).WithError(err).Info("reattach: no running task")
102101
return nil
103102
}
@@ -237,7 +236,7 @@ func (c *containerAdapter) prepare(ctx context.Context) error {
237236

238237
c.container, err = c.client.NewContainer(ctx, c.name,
239238
containerd.WithSpec(spec),
240-
containerd.WithNewRootFS(c.name, c.image))
239+
containerd.WithNewSnapshot(c.name, c.image))
241240
if err != nil {
242241
return errors.Wrap(err, "creating container")
243242
}
@@ -282,7 +281,7 @@ func (c *containerAdapter) wait(ctx context.Context) error {
282281
type status struct {
283282
ID string
284283
Pid uint32
285-
Status containerd.TaskStatus
284+
Status containerd.Status
286285
ExitStatus error
287286
}
288287

‎agent/exec/containerd/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func (r *controller) Start(ctx context.Context) error {
161161
//
162162
// TODO(stevvooe): This is very racy. While reading inspect, another could
163163
// start the process and we could end up starting it twice.
164-
if ctnr.Status != containerd.Created {
164+
if ctnr.Status.Status != containerd.Created {
165165
return exec.ErrTaskStarted
166166
}
167167

‎agent/exec/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import (
44
"fmt"
55
"time"
66

7-
"github.com/Sirupsen/logrus"
87
"github.com/docker/swarmkit/api"
98
"github.com/docker/swarmkit/api/equality"
109
"github.com/docker/swarmkit/log"
1110
"github.com/docker/swarmkit/protobuf/ptypes"
1211
"github.com/pkg/errors"
12+
"github.com/sirupsen/logrus"
1313
"golang.org/x/net/context"
1414
)
1515

‎agent/exec/dockerapi/adapter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"strings"
88
"time"
99

10-
"github.com/Sirupsen/logrus"
1110
"github.com/docker/docker/api/types"
1211
"github.com/docker/docker/api/types/events"
1312
engineapi "github.com/docker/docker/client"
@@ -16,6 +15,7 @@ import (
1615
"github.com/docker/swarmkit/log"
1716
gogotypes "github.com/gogo/protobuf/types"
1817
"github.com/pkg/errors"
18+
"github.com/sirupsen/logrus"
1919
"golang.org/x/net/context"
2020
"golang.org/x/time/rate"
2121
)

‎agent/session.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"sync"
66
"time"
77

8-
"github.com/Sirupsen/logrus"
98
"github.com/docker/swarmkit/api"
109
"github.com/docker/swarmkit/connectionbroker"
1110
"github.com/docker/swarmkit/log"
11+
"github.com/sirupsen/logrus"
1212
"golang.org/x/net/context"
1313
"google.golang.org/grpc"
1414
"google.golang.org/grpc/codes"

‎agent/task_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"testing"
55
"time"
66

7-
"github.com/Sirupsen/logrus"
87
"github.com/docker/swarmkit/agent/exec"
98
"github.com/docker/swarmkit/api"
9+
"github.com/sirupsen/logrus"
1010
"github.com/stretchr/testify/assert"
1111
"golang.org/x/net/context"
1212
)

‎agent/worker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package agent
33
import (
44
"sync"
55

6-
"github.com/Sirupsen/logrus"
76
"github.com/boltdb/bolt"
87
"github.com/docker/swarmkit/agent/exec"
98
"github.com/docker/swarmkit/api"
109
"github.com/docker/swarmkit/log"
1110
"github.com/docker/swarmkit/watch"
11+
"github.com/sirupsen/logrus"
1212
"golang.org/x/net/context"
1313
)
1414

‎agent/worker_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package agent
33
import (
44
"testing"
55

6-
"github.com/Sirupsen/logrus"
76
"github.com/boltdb/bolt"
87
"github.com/docker/swarmkit/agent/exec"
98
"github.com/docker/swarmkit/api"
109
"github.com/docker/swarmkit/log"
10+
"github.com/sirupsen/logrus"
1111
"github.com/stretchr/testify/assert"
1212
"golang.org/x/net/context"
1313
)

‎ca/auth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"crypto/x509/pkix"
66
"strings"
77

8-
"github.com/Sirupsen/logrus"
8+
"github.com/sirupsen/logrus"
99

1010
"github.com/docker/swarmkit/api"
1111
"github.com/docker/swarmkit/log"

‎ca/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"sync"
1313
"time"
1414

15-
"github.com/Sirupsen/logrus"
1615
cfconfig "github.com/cloudflare/cfssl/config"
1716
events "github.com/docker/go-events"
1817
"github.com/docker/swarmkit/api"
@@ -22,6 +21,7 @@ import (
2221
"github.com/docker/swarmkit/watch"
2322
"github.com/opencontainers/go-digest"
2423
"github.com/pkg/errors"
24+
"github.com/sirupsen/logrus"
2525
"google.golang.org/grpc/credentials"
2626

2727
"golang.org/x/net/context"

‎ca/config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717

1818
"golang.org/x/net/context"
1919

20-
"github.com/Sirupsen/logrus"
2120
cfconfig "github.com/cloudflare/cfssl/config"
2221
"github.com/cloudflare/cfssl/helpers"
2322
"github.com/docker/swarmkit/api"
@@ -28,6 +27,7 @@ import (
2827
"github.com/docker/swarmkit/manager/state/store"
2928
"github.com/docker/swarmkit/testutils"
3029
"github.com/pkg/errors"
30+
"github.com/sirupsen/logrus"
3131
"github.com/stretchr/testify/assert"
3232
"github.com/stretchr/testify/require"
3333
)

‎ca/external.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ import (
1414
"sync"
1515
"time"
1616

17-
"github.com/Sirupsen/logrus"
1817
"github.com/cloudflare/cfssl/api"
1918
"github.com/cloudflare/cfssl/config"
2019
"github.com/cloudflare/cfssl/csr"
2120
"github.com/cloudflare/cfssl/signer"
2221
"github.com/docker/swarmkit/log"
2322
"github.com/pkg/errors"
23+
"github.com/sirupsen/logrus"
2424
"golang.org/x/net/context"
2525
"golang.org/x/net/context/ctxhttp"
2626
)

‎ca/external_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99
"testing"
1010
"time"
1111

12-
"github.com/Sirupsen/logrus"
1312
"github.com/cloudflare/cfssl/helpers"
1413
"github.com/docker/swarmkit/ca"
1514
"github.com/docker/swarmkit/ca/testutils"
1615
"github.com/docker/swarmkit/log"
16+
"github.com/sirupsen/logrus"
1717
"github.com/stretchr/testify/require"
1818
)
1919

‎ca/renewer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"sync"
55
"time"
66

7-
"github.com/Sirupsen/logrus"
87
"github.com/docker/go-events"
98
"github.com/docker/swarmkit/connectionbroker"
109
"github.com/docker/swarmkit/log"
1110
"github.com/pkg/errors"
11+
"github.com/sirupsen/logrus"
1212
"golang.org/x/net/context"
1313
)
1414

‎ca/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import (
77
"sync"
88
"time"
99

10-
"github.com/Sirupsen/logrus"
1110
"github.com/docker/swarmkit/api"
1211
"github.com/docker/swarmkit/api/equality"
1312
"github.com/docker/swarmkit/identity"
1413
"github.com/docker/swarmkit/log"
1514
"github.com/docker/swarmkit/manager/state/store"
1615
gogotypes "github.com/gogo/protobuf/types"
1716
"github.com/pkg/errors"
17+
"github.com/sirupsen/logrus"
1818
"golang.org/x/net/context"
1919
"google.golang.org/grpc"
2020
"google.golang.org/grpc/codes"

‎ca/server_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"testing"
1313
"time"
1414

15-
"github.com/Sirupsen/logrus"
1615
"github.com/cloudflare/cfssl/helpers"
1716
"github.com/docker/swarmkit/api"
1817
"github.com/docker/swarmkit/api/equality"
@@ -23,6 +22,7 @@ import (
2322
"github.com/docker/swarmkit/testutils"
2423
"github.com/opencontainers/go-digest"
2524
"github.com/pkg/errors"
25+
"github.com/sirupsen/logrus"
2626
"github.com/stretchr/testify/assert"
2727
"github.com/stretchr/testify/require"
2828
"golang.org/x/net/context"

‎ca/testutils/cautils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"testing"
1313
"time"
1414

15-
"github.com/Sirupsen/logrus"
1615
cfcsr "github.com/cloudflare/cfssl/csr"
1716
"github.com/cloudflare/cfssl/helpers"
1817
"github.com/cloudflare/cfssl/initca"
@@ -25,6 +24,7 @@ import (
2524
"github.com/docker/swarmkit/manager/state/store"
2625
stateutils "github.com/docker/swarmkit/manager/state/testutils"
2726
"github.com/docker/swarmkit/remotes"
27+
"github.com/sirupsen/logrus"
2828
"github.com/stretchr/testify/assert"
2929
"github.com/stretchr/testify/require"
3030
"golang.org/x/net/context"

‎cmd/external-ca-example/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"path/filepath"
88
"syscall"
99

10-
"github.com/Sirupsen/logrus"
1110
"github.com/docker/swarmkit/ca"
1211
"github.com/docker/swarmkit/ca/testutils"
1312
"github.com/docker/swarmkit/identity"
13+
"github.com/sirupsen/logrus"
1414
)
1515

1616
func main() {

‎cmd/swarmd/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"os"
1010
"os/signal"
1111

12-
"github.com/Sirupsen/logrus"
1312
engineapi "github.com/docker/docker/client"
1413
"github.com/docker/swarmkit/agent/exec"
1514
"github.com/docker/swarmkit/agent/exec/containerd"
@@ -24,6 +23,7 @@ import (
2423
"github.com/docker/swarmkit/version"
2524
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
2625
"github.com/prometheus/client_golang/prometheus"
26+
"github.com/sirupsen/logrus"
2727
"github.com/spf13/cobra"
2828
"golang.org/x/net/context"
2929
)

‎integration/cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88

99
"google.golang.org/grpc"
1010

11-
"github.com/Sirupsen/logrus"
1211
"github.com/docker/swarmkit/api"
1312
"github.com/docker/swarmkit/ca"
1413
"github.com/docker/swarmkit/identity"
1514
"github.com/docker/swarmkit/log"
1615
"github.com/docker/swarmkit/node"
1716
"github.com/docker/swarmkit/testutils"
17+
"github.com/sirupsen/logrus"
1818
"golang.org/x/net/context"
1919
)
2020

‎integration/integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616

1717
"reflect"
1818

19-
"github.com/Sirupsen/logrus"
2019
"github.com/cloudflare/cfssl/helpers"
2120
events "github.com/docker/go-events"
2221
"github.com/docker/swarmkit/api"
@@ -26,6 +25,7 @@ import (
2625
"github.com/docker/swarmkit/manager"
2726
"github.com/docker/swarmkit/testutils"
2827
"github.com/pkg/errors"
28+
"github.com/sirupsen/logrus"
2929
"github.com/stretchr/testify/require"
3030
)
3131

‎log/context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package log
33
import (
44
"path"
55

6-
"github.com/Sirupsen/logrus"
6+
"github.com/sirupsen/logrus"
77
"golang.org/x/net/context"
88
)
99

‎manager/controlapi/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"bytes"
55
"strings"
66

7-
"github.com/Sirupsen/logrus"
87
"github.com/docker/swarmkit/api"
98
"github.com/docker/swarmkit/identity"
109
"github.com/docker/swarmkit/log"
1110
"github.com/docker/swarmkit/manager/state/store"
11+
"github.com/sirupsen/logrus"
1212
"golang.org/x/net/context"
1313
"google.golang.org/grpc"
1414
"google.golang.org/grpc/codes"

‎manager/controlapi/node_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import (
66
"log"
77
"testing"
88

9-
"github.com/Sirupsen/logrus"
109
"github.com/docker/swarmkit/api"
1110
cautils "github.com/docker/swarmkit/ca/testutils"
1211
"github.com/docker/swarmkit/identity"
1312
raftutils "github.com/docker/swarmkit/manager/state/raft/testutils"
1413
"github.com/docker/swarmkit/manager/state/store"
1514
"github.com/docker/swarmkit/testutils"
15+
"github.com/sirupsen/logrus"
1616
"github.com/stretchr/testify/assert"
1717
"github.com/stretchr/testify/require"
1818
"golang.org/x/net/context"

‎manager/controlapi/secret.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import (
44
"crypto/subtle"
55
"strings"
66

7-
"github.com/Sirupsen/logrus"
87
"github.com/docker/swarmkit/api"
98
"github.com/docker/swarmkit/api/validation"
109
"github.com/docker/swarmkit/identity"
1110
"github.com/docker/swarmkit/log"
1211
"github.com/docker/swarmkit/manager/state/store"
12+
"github.com/sirupsen/logrus"
1313
"golang.org/x/net/context"
1414
"google.golang.org/grpc"
1515
"google.golang.org/grpc/codes"

‎manager/dispatcher/assignments.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package dispatcher
33
import (
44
"fmt"
55

6-
"github.com/Sirupsen/logrus"
76
"github.com/docker/swarmkit/api"
87
"github.com/docker/swarmkit/api/equality"
98
"github.com/docker/swarmkit/api/validation"
109
"github.com/docker/swarmkit/manager/drivers"
1110
"github.com/docker/swarmkit/manager/state/store"
11+
"github.com/sirupsen/logrus"
1212
)
1313

1414
type typeAndID struct {

0 commit comments

Comments
 (0)