Merge pull request #953 from faycheng/correct-sirupsen-import

bugfix: corrent the import path of logrus
AliyunContainerService · Mar 23, 2018 · f1cee76 · f1cee76
2 parents cdc2e13 + 8e70a80
commit f1cee76
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/daemon/mgr/network.go b/daemon/mgr/network.go
@@ -14,7 +14,6 @@ import (
 	"github.com/alibaba/pouch/pkg/meta"
 	"github.com/alibaba/pouch/pkg/randomid"
 
-	netlog "github.com/Sirupsen/logrus"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/libnetwork"
 	nwconfig "github.com/docker/libnetwork/config"
@@ -411,15 +410,15 @@ func (nm *NetworkManager) getNetworkSandbox(id string) libnetwork.Sandbox {
 
 func initNetworkLog(cfg *config.Config) {
 	if cfg.Debug {
-		netlog.SetLevel(netlog.DebugLevel)
+		logrus.SetLevel(logrus.DebugLevel)
 	}
 
-	formatter := &netlog.TextFormatter{
+	formatter := &logrus.TextFormatter{
 		ForceColors:     true,
 		FullTimestamp:   true,
 		TimestampFormat: "2006-01-02 15:04:05.000000000",
 	}
-	netlog.SetFormatter(formatter)
+	logrus.SetFormatter(formatter)
 }
 
 func endpointOptions(n libnetwork.Network, nwconfig *apitypes.NetworkSettings, epConfig *apitypes.EndpointSettings) ([]libnetwork.EndpointOption, error) {

diff --git a/network/mode/bridge/bridge.go b/network/mode/bridge/bridge.go
@@ -9,13 +9,13 @@ import (
 
 	"github.com/alibaba/pouch/apis/types"
 	"github.com/alibaba/pouch/daemon/mgr"
-	"github.com/alibaba/pouch/extra/libnetwork/Godeps/_workspace/src/github.com/Sirupsen/logrus"
 	"github.com/alibaba/pouch/network"
 	"github.com/alibaba/pouch/pkg/errtypes"
 
 	"github.com/docker/libnetwork/drivers/bridge"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 )
 

diff --git a/registry/auth.go b/registry/auth.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/alibaba/pouch/apis/types"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 
 // challengeClient defines a client to manage challenge–response authentication.

diff --git a/volume/core.go b/volume/core.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/alibaba/pouch/extra/libnetwork/Godeps/_workspace/src/github.com/Sirupsen/logrus"
 	"github.com/alibaba/pouch/pkg/client"
 	metastore "github.com/alibaba/pouch/pkg/meta"
 	"github.com/alibaba/pouch/volume/driver"
@@ -13,7 +12,7 @@ import (
 	"github.com/alibaba/pouch/volume/types/meta"
 
 	"github.com/pkg/errors"
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 
 // Core represents volume core struct.
@@ -45,7 +44,7 @@ func NewCore(cfg Config) (*Core, error) {
 		},
 	})
 	if err != nil {
-		log.Errorf("failed to create volume meta store: %v", err)
+		logrus.Errorf("failed to create volume meta store: %v", err)
 		return nil, err
 	}
 
@@ -206,7 +205,7 @@ func (c *Core) ListVolumeName(labels map[string]string) ([]string, error) {
 			return nil, errors.Wrap(err, "List volume's name")
 		}
 
-		log.Debugf("List volume URL: %s, labels: %s", url, labels)
+		logrus.Debugf("List volume URL: %s, labels: %s", url, labels)
 
 		if err := client.New().ListKeys(url, &names); err != nil {
 			return nil, errors.Wrap(err, "List volume's name")