Merge pull request #283 from leodotcloud/change_log_package

Change log package
rancher · Jul 9, 2018 · 7feaf17 · 7feaf17
2 parents 7b2ef36 + 4c594fa
commit 7feaf17
Show file tree

Hide file tree

Showing 51 changed files with 51 additions and 61 deletions.
diff --git a/cloudprovider/cloud_provider.go b/cloudprovider/cloud_provider.go
@@ -6,9 +6,9 @@ import (
 	"path"
 	"time"
 
-	"github.com/leodotcloud/log"
 	"github.com/rancher/agent/core/hostinfo"
 	"github.com/rancher/agent/utilities/config"
+	"github.com/rancher/log"
 )
 
 const (

diff --git a/core/compute/compute.go b/core/compute/compute.go
@@ -9,14 +9,14 @@ import (
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/client"
-	"github.com/leodotcloud/log"
 	"github.com/pkg/errors"
 	"github.com/rancher/agent/core/image"
 	"github.com/rancher/agent/core/progress"
 	"github.com/rancher/agent/model"
 	"github.com/rancher/agent/utilities/constants"
 	dutils "github.com/rancher/agent/utilities/docker"
 	"github.com/rancher/agent/utilities/utils"
+	"github.com/rancher/log"
 	"golang.org/x/net/context"
 )
 

diff --git a/core/compute/compute_common.go b/core/compute/compute_common.go
@@ -14,7 +14,6 @@ import (
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
-	"github.com/leodotcloud/log"
 	"github.com/pkg/errors"
 	"github.com/rancher/agent/core/image"
 	"github.com/rancher/agent/core/progress"
@@ -23,6 +22,7 @@ import (
 	configuration "github.com/rancher/agent/utilities/config"
 	"github.com/rancher/agent/utilities/constants"
 	"github.com/rancher/agent/utilities/utils"
+	"github.com/rancher/log"
 	"golang.org/x/net/context"
 )
 

diff --git a/core/compute/compute_test.go b/core/compute/compute_test.go
@@ -11,13 +11,13 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/blkiodev"
 	"github.com/docker/docker/api/types/container"
-	"github.com/leodotcloud/log"
 	"github.com/nu7hatch/gouuid"
 	"github.com/rancher/agent/model"
 	"github.com/rancher/agent/utilities/config"
 	"github.com/rancher/agent/utilities/constants"
 	"github.com/rancher/agent/utilities/docker"
 	"github.com/rancher/agent/utilities/utils"
+	"github.com/rancher/log"
 	"golang.org/x/net/context"
 	"gopkg.in/check.v1"
 )

diff --git a/core/compute/compute_unix.go b/core/compute/compute_unix.go
@@ -16,14 +16,14 @@ import (
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
-	"github.com/leodotcloud/log"
 	"github.com/pkg/errors"
 	"github.com/rancher/agent/core/hostinfo"
 	"github.com/rancher/agent/core/storage"
 	"github.com/rancher/agent/model"
 	"github.com/rancher/agent/utilities/constants"
 	dutils "github.com/rancher/agent/utilities/docker"
 	"github.com/rancher/agent/utilities/utils"
+	"github.com/rancher/log"
 )
 
 var (

diff --git a/core/hostinfo/host_info.go b/core/hostinfo/host_info.go
@@ -1,10 +1,10 @@
 package hostinfo
 
 import (
-	"github.com/leodotcloud/log"
 	"github.com/pkg/errors"
 	"github.com/rancher/agent/model"
 	"github.com/rancher/agent/utilities/constants"
+	"github.com/rancher/log"
 )
 
 type Collector interface {

diff --git a/core/hostinfo/key_info.go b/core/hostinfo/key_info.go
@@ -9,9 +9,9 @@ import (
 	"os"
 	"path"
 
-	"github.com/leodotcloud/log"
 	"github.com/pkg/errors"
 	"github.com/rancher/agent/utilities/config"
+	"github.com/rancher/log"
 )
 
 type KeyCollector struct {

diff --git a/core/marshaller/marshaller.go b/core/marshaller/marshaller.go
@@ -3,9 +3,9 @@ package marshaller
 import (
 	"encoding/json"
 
-	"github.com/leodotcloud/log"
 	"github.com/pkg/errors"
 	"github.com/rancher/agent/utilities/constants"
+	"github.com/rancher/log"
 )
 
 func FromString(rawstring string) map[string]interface{} {

diff --git a/core/ping/ping_common.go b/core/ping/ping_common.go
@@ -9,14 +9,14 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/client"
-	"github.com/leodotcloud/log"
 	"github.com/pkg/errors"
 	"github.com/rancher/agent/core/hostinfo"
 	"github.com/rancher/agent/model"
 	"github.com/rancher/agent/utilities/config"
 	"github.com/rancher/agent/utilities/constants"
 	"github.com/rancher/agent/utilities/utils"
 	revents "github.com/rancher/event-subscriber/events"
+	"github.com/rancher/log"
 	"github.com/shirou/gopsutil/disk"
 	"golang.org/x/net/context"
 )

diff --git a/core/progress/progress.go b/core/progress/progress.go
@@ -3,9 +3,9 @@ package progress
 import (
 	"fmt"
 
-	"github.com/leodotcloud/log"
 	revents "github.com/rancher/event-subscriber/events"
 	"github.com/rancher/go-rancher/v2"
+	"github.com/rancher/log"
 )
 
 type Progress struct {

diff --git a/core/storage/plugin_unix.go b/core/storage/plugin_unix.go
@@ -11,9 +11,9 @@ import (
 	"strings"
 
 	"github.com/docker/go-connections/sockets"
-	"github.com/leodotcloud/log"
 	"github.com/pkg/errors"
 	"github.com/rancher/agent/model"
+	"github.com/rancher/log"
 )
 
 func CallRancherStorageVolumePlugin(volume model.Volume, action string, payload interface{}) (Response, error) {

diff --git a/core/storage/volume.go b/core/storage/volume.go
@@ -9,13 +9,13 @@ import (
 
 	"github.com/docker/docker/api/types"
 	engineCli "github.com/docker/docker/client"
-	"github.com/leodotcloud/log"
 	"github.com/patrickmn/go-cache"
 	"github.com/pkg/errors"
 	"github.com/rancher/agent/core/progress"
 	"github.com/rancher/agent/model"
 	"github.com/rancher/agent/utilities/constants"
 	"github.com/rancher/agent/utilities/utils"
+	"github.com/rancher/log"
 	"golang.org/x/net/context"
 )
 

diff --git a/events/listener.go b/events/listener.go
@@ -4,12 +4,12 @@ import (
 	"os"
 	"time"
 
-	"github.com/leodotcloud/log"
 	"github.com/pkg/errors"
 	"github.com/rancher/agent/handlers"
 	"github.com/rancher/agent/service/hostapi"
 	"github.com/rancher/agent/utilities/config"
 	revents "github.com/rancher/event-subscriber/events"
+	"github.com/rancher/log"
 )
 
 func Listen(eventURL, accessKey, secretKey string, workerCount int) error {

diff --git a/handlers/common.go b/handlers/common.go
@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/docker/docker/api/types"
-	"github.com/leodotcloud/log"
 	goUUID "github.com/nu7hatch/gouuid"
 	"github.com/patrickmn/go-cache"
 	"github.com/pkg/errors"
@@ -15,6 +14,7 @@ import (
 	"github.com/rancher/agent/utilities/docker"
 	revents "github.com/rancher/event-subscriber/events"
 	"github.com/rancher/go-rancher/v2"
+	"github.com/rancher/log"
 	"golang.org/x/net/context"
 )
 

diff --git a/handlers/common_test.go b/handlers/common_test.go
@@ -8,11 +8,11 @@ import (
 	"time"
 
 	"github.com/docker/docker/api/types"
-	"github.com/leodotcloud/log"
 	"github.com/rancher/agent/utilities/docker"
 	revents "github.com/rancher/event-subscriber/events"
 	"github.com/rancher/event-subscriber/locks"
 	"github.com/rancher/go-rancher/v2"
+	"github.com/rancher/log"
 	"golang.org/x/net/context"
 	"gopkg.in/check.v1"
 )

diff --git a/handlers/compute.go b/handlers/compute.go
@@ -4,7 +4,6 @@ import (
 	"strings"
 
 	engineCli "github.com/docker/docker/client"
-	"github.com/leodotcloud/log"
 	"github.com/mitchellh/mapstructure"
 	cache "github.com/patrickmn/go-cache"
 	"github.com/pkg/errors"
@@ -15,6 +14,7 @@ import (
 	"github.com/rancher/agent/utilities/utils"
 	revents "github.com/rancher/event-subscriber/events"
 	"github.com/rancher/go-rancher/v2"
+	"github.com/rancher/log"
 )
 
 type ComputeHandler struct {

diff --git a/handlers/storage.go b/handlers/storage.go
@@ -4,7 +4,6 @@ import (
 	"context"
 
 	engineCli "github.com/docker/docker/client"
-	"github.com/leodotcloud/log"
 	"github.com/mitchellh/mapstructure"
 	"github.com/patrickmn/go-cache"
 	"github.com/pkg/errors"
@@ -15,6 +14,7 @@ import (
 	"github.com/rancher/agent/utilities/utils"
 	revents "github.com/rancher/event-subscriber/events"
 	"github.com/rancher/go-rancher/v2"
+	"github.com/rancher/log"
 )
 
 type StorageHandler struct {

diff --git a/main.go b/main.go
@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/leodotcloud/log"
-	logserver "github.com/leodotcloud/log/server"
 	"github.com/rancher/agent/cloudprovider"
 	"github.com/rancher/agent/events"
 	"github.com/rancher/agent/register"
 	"github.com/rancher/agent/utilities/config"
+	"github.com/rancher/log"
+	logserver "github.com/rancher/log/server"
 
 	_ "github.com/rancher/agent/cloudprovider/aliyun"
 	_ "github.com/rancher/agent/cloudprovider/aws"

diff --git a/register/register.go b/register/register.go
@@ -13,9 +13,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/leodotcloud/log"
 	"github.com/pkg/errors"
 	"github.com/rancher/go-rancher/v2"
+	"github.com/rancher/log"
 )
 
 const (

diff --git a/service/hostapi/console/console.go b/service/hostapi/console/console.go
@@ -7,8 +7,8 @@ import (
 	"net"
 	"net/url"
 
-	"github.com/leodotcloud/log"
 	"github.com/rancher/agent/service/hostapi/auth"
+	"github.com/rancher/log"
 	"github.com/rancher/websocket-proxy/backend"
 	"github.com/rancher/websocket-proxy/common"
 )

diff --git a/service/hostapi/dockersocketproxy/proxy.go b/service/hostapi/dockersocketproxy/proxy.go
@@ -6,8 +6,8 @@ import (
 	"net"
 	"net/url"
 
-	"github.com/leodotcloud/log"
 	"github.com/rancher/agent/service/hostapi/auth"
+	"github.com/rancher/log"
 	"github.com/rancher/websocket-proxy/backend"
 	"github.com/rancher/websocket-proxy/common"
 )

diff --git a/service/hostapi/dockersocketproxy/proxy_test.go b/service/hostapi/dockersocketproxy/proxy_test.go
@@ -15,10 +15,10 @@ import (
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/client"
 	"github.com/gorilla/websocket"
-	"github.com/leodotcloud/log"
 	"github.com/rancher/agent/service/hostapi/config"
 	"github.com/rancher/agent/service/hostapi/events"
 	"github.com/rancher/agent/service/hostapi/testutils"
+	"github.com/rancher/log"
 	"github.com/rancher/websocket-proxy/backend"
 	"github.com/rancher/websocket-proxy/proxy"
 	wsp_utils "github.com/rancher/websocket-proxy/testutils"

diff --git a/service/hostapi/events/entry_test.go b/service/hostapi/events/entry_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/client"
-	"github.com/leodotcloud/log"
 	rclient "github.com/rancher/go-rancher/client"
+	"github.com/rancher/log"
 )
 
 func TestProcessDockerEvents(t *testing.T) {

diff --git a/service/hostapi/events/event_router.go b/service/hostapi/events/event_router.go
@@ -7,7 +7,7 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/client"
-	"github.com/leodotcloud/log"
+	"github.com/rancher/log"
 )
 
 const workerTimeout = 60 * time.Second

diff --git a/service/hostapi/events/send_to_rancher_handler.go b/service/hostapi/events/send_to_rancher_handler.go
@@ -4,9 +4,9 @@ import (
 	"github.com/docker/distribution/context"
 	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/client"
-	"github.com/leodotcloud/log"
 	"github.com/rancher/event-subscriber/locks"
 	rclient "github.com/rancher/go-rancher/client"
+	"github.com/rancher/log"
 )
 
 type SendToRancherHandler struct {

diff --git a/service/hostapi/exec/exec.go b/service/hostapi/exec/exec.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/docker/distribution/context"
 	"github.com/docker/docker/api/types"
-	"github.com/leodotcloud/log"
 	"github.com/rancher/agent/service/hostapi/auth"
 	"github.com/rancher/agent/service/hostapi/events"
+	"github.com/rancher/log"
 	"github.com/rancher/websocket-proxy/backend"
 	"github.com/rancher/websocket-proxy/common"
 )

diff --git a/service/hostapi/hostapi.go b/service/hostapi/hostapi.go
@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	"github.com/leodotcloud/log"
 	"github.com/pkg/errors"
 	"github.com/rancher/agent/service/hostapi/config"
 	"github.com/rancher/agent/service/hostapi/console"
@@ -20,6 +19,7 @@ import (
 	"github.com/rancher/agent/service/hostapi/stats"
 	"github.com/rancher/agent/service/hostapi/util"
 	rclient "github.com/rancher/go-rancher/client"
+	"github.com/rancher/log"
 	"github.com/rancher/websocket-proxy/backend"
 )
 

diff --git a/service/hostapi/logs/logs.go b/service/hostapi/logs/logs.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 
 	"github.com/docker/docker/api/types"
-	"github.com/leodotcloud/log"
 	"github.com/rancher/agent/service/hostapi/auth"
 	"github.com/rancher/agent/service/hostapi/events"
+	"github.com/rancher/log"
 	"github.com/rancher/websocket-proxy/backend"
 	"github.com/rancher/websocket-proxy/common"
 	"golang.org/x/net/context"

diff --git a/service/hostapi/logs/logs_test.go b/service/hostapi/logs/logs_test.go
@@ -13,10 +13,10 @@ import (
 	"github.com/docker/docker/api/types/container"
 	docker "github.com/docker/docker/client"
 	"github.com/gorilla/websocket"
-	"github.com/leodotcloud/log"
 	"github.com/rancher/agent/service/hostapi/config"
 	"github.com/rancher/agent/service/hostapi/events"
 	"github.com/rancher/agent/service/hostapi/testutils"
+	"github.com/rancher/log"
 	"github.com/rancher/websocket-proxy/backend"
 	"github.com/rancher/websocket-proxy/proxy"
 	wsp_utils "github.com/rancher/websocket-proxy/testutils"

diff --git a/service/hostapi/pkg/haproxy/haproxy.go b/service/hostapi/pkg/haproxy/haproxy.go
@@ -6,7 +6,7 @@ import (
 	"net"
 	"strings"
 
-	"github.com/leodotcloud/log"
+	"github.com/rancher/log"
 )
 
 type Stat map[string]string

diff --git a/service/hostapi/proxy/io.go b/service/hostapi/proxy/io.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"io"
 
-	"github.com/leodotcloud/log"
+	"github.com/rancher/log"
 	"github.com/rancher/websocket-proxy/common"
 )