Skip to content
/ sealos Public
forked from labring/sealos

Commit cd3144d

Browse files
zzjinzzjin
committed
Unite log system with zap (labring#1300)
* replace sysytem log to logger * replace old logger code * remove logrus package * replace glog with new impl Signed-off-by: zzjin <[email protected]>
1 parent 82fca0b commit cd3144d

Some content is hidden

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

50 files changed

+2624
-5160
lines changed

‎cmd/image-cri-shim/cmd/root.go

+15-15
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626
"github.com/labring/sealos/pkg/version"
2727

2828
"github.com/labring/image-cri-shim/pkg/cri"
29-
"github.com/labring/image-cri-shim/pkg/glog"
3029
"github.com/labring/image-cri-shim/pkg/server"
3130
"github.com/labring/image-cri-shim/pkg/shim"
3231
"github.com/labring/image-cri-shim/pkg/utils"
32+
"github.com/labring/sealos/pkg/utils/logger"
3333
"github.com/pkg/errors"
3434
"github.com/spf13/cobra"
3535
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -55,22 +55,22 @@ var rootCmd = &cobra.Command{
5555
return errors.Wrap(err, "image shim config load error")
5656
}
5757
shimSocket, _, _ = unstructured.NestedString(data, "shim")
58-
glog.Infof("shim-socket: %s", shimSocket)
58+
logger.Info("shim-socket: %s", shimSocket)
5959
criSocket, _, _ = unstructured.NestedString(data, "cri")
60-
glog.Infof("cri-socket: %s", criSocket)
60+
logger.Info("cri-socket: %s", criSocket)
6161
server.SealosHub, _, _ = unstructured.NestedString(data, "address")
62-
glog.Infof("hub-address: %s", server.SealosHub)
62+
logger.Info("hub-address: %s", server.SealosHub)
6363
force, _, _ = unstructured.NestedBool(data, "force")
64-
glog.Infof("force: %v", force)
64+
logger.Info("force: %v", force)
6565
server.Debug, _, _ = unstructured.NestedBool(data, "debug")
66-
glog.Infof("debug: %v", server.Debug)
66+
logger.Info("debug: %v", server.Debug)
6767
imageDir, _, _ := unstructured.NestedString(data, "image")
68-
glog.Infof("image-dir: %v", imageDir)
68+
logger.Info("image-dir: %v", imageDir)
6969
server.Auth, _, _ = unstructured.NestedString(data, "auth")
7070
if server.Auth != "" {
71-
glog.Infof("auth: %v", server.Auth)
71+
logger.Info("auth: %v", server.Auth)
7272
server.Base64Auth = base64.StdEncoding.EncodeToString([]byte(server.Auth))
73-
glog.Infof("base64 auth: %v", server.Base64Auth)
73+
logger.Info("base64 auth: %v", server.Base64Auth)
7474
}
7575

7676
if imageDir != "" {
@@ -81,7 +81,7 @@ var rootCmd = &cobra.Command{
8181
}
8282

8383
if server.SealosHub == "" {
84-
glog.Warning("registry addr is empty")
84+
logger.Warn("registry addr is empty")
8585
}
8686
if criSocket == "" {
8787
socket, err := cri.DetectCRISocket()
@@ -124,20 +124,20 @@ func run(socket string, criSocket string) {
124124
ShimSocket: socket,
125125
ImageSocket: criSocket,
126126
}
127-
glog.Infof("socket info shim: %v ,image: %v, registry: %v", socket, criSocket, server.SealosHub)
127+
logger.Info("socket info shim: %v ,image: %v, registry: %v", socket, criSocket, server.SealosHub)
128128
_shim, err := shim.NewShim(options)
129129
if err != nil {
130-
glog.Fatalf("failed to new _shim, %s", err)
130+
logger.Fatal("failed to new _shim, %s", err)
131131
}
132132

133133
err = _shim.Setup()
134134
if err != nil {
135-
glog.Fatalf("failed to setup image _shim, %s", err)
135+
logger.Fatal("failed to setup image _shim, %s", err)
136136
}
137137

138138
err = _shim.Start()
139139
if err != nil {
140-
glog.Fatalf(fmt.Sprintf("failed to start image _shim, %s", err))
140+
logger.Fatal(fmt.Sprintf("failed to start image _shim, %s", err))
141141
}
142142

143143
signalCh := make(chan os.Signal, 1)
@@ -150,5 +150,5 @@ func run(socket string, criSocket string) {
150150
case <-stopCh:
151151
}
152152
_ = os.Remove(socket)
153-
glog.Infof("Shutting down the image _shim")
153+
logger.Info("Shutting down the image _shim")
154154
}

‎cmd/lvscare/cmd/care.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ package cmd
1616

1717
import (
1818
"github.com/labring/lvscare/care"
19-
"github.com/labring/lvscare/pkg/glog"
19+
"github.com/labring/sealos/pkg/utils/logger"
2020
"github.com/spf13/cobra"
2121
)
2222

@@ -41,13 +41,14 @@ var careCmd = &cobra.Command{
4141

4242
func init() {
4343
cobra.OnInitialize(func() {
44+
//TODO: expose showPath flag?
4445
switch care.LVS.Logger {
4546
case "INFO":
46-
glog.InitVerbosity(0)
47+
logger.CfgConsoleLogger(false, false)
4748
case "DEBG":
48-
glog.InitVerbosity(9)
49+
logger.CfgConsoleLogger(true, false)
4950
default:
50-
glog.InitVerbosity(0)
51+
logger.CfgConsoleLogger(false, false)
5152
}
5253
})
5354
rootCmd.AddCommand(careCmd)

‎cmd/sealctl/cmd/root.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func Execute() {
4848

4949
func init() {
5050
cobra.OnInitialize(func() {
51-
logger.Cfg(debug, showPath)
51+
logger.CfgConsoleLogger(debug, showPath)
5252
})
5353

5454
rootCmd.PersistentFlags().BoolVar(&debug, "debug", false, "enable debug logger")

‎cmd/sealos/cmd/root.go

+1-10
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/labring/sealos/pkg/utils/file"
2323
"github.com/labring/sealos/pkg/utils/logger"
2424

25-
"github.com/sirupsen/logrus"
2625
"github.com/spf13/cobra"
2726
)
2827

@@ -67,13 +66,5 @@ func onBootOnDie() {
6766
logger.Error(err)
6867
panic(1)
6968
}
70-
logger.CfgAndFile(debug, constants.LogPath(), "sealos", false)
71-
setupLogrus()
72-
}
73-
74-
const logLevel = "warn"
75-
76-
func setupLogrus() {
77-
logrusLvl, _ := logrus.ParseLevel(logLevel)
78-
logrus.SetLevel(logrusLvl)
69+
logger.CfgConsoleAndFileLogger(debug, constants.LogPath(), "sealos", false)
7970
}

‎go.mod

+3-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ require (
1717
github.com/docker/go-units v0.4.0
1818
github.com/emicklei/go-restful v2.15.0+incompatible
1919
github.com/emirpasic/gods v1.18.1
20-
github.com/fsnotify/fsnotify v1.5.1 // indirect
2120
github.com/hashicorp/go-multierror v1.1.1
2221
github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.0.72
2322
github.com/imdario/mergo v0.3.12
@@ -33,15 +32,14 @@ require (
3332
github.com/pkg/errors v0.9.1
3433
github.com/pkg/sftp v1.13.0
3534
github.com/schollz/progressbar/v3 v3.8.6
36-
github.com/sirupsen/logrus v1.8.1
3735
github.com/spf13/cobra v1.4.0
3836
github.com/spf13/pflag v1.0.5
37+
go.uber.org/zap v1.21.0
3938
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
40-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
4139
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
4240
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e
4341
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
44-
gopkg.in/ini.v1 v1.66.2 // indirect
42+
gopkg.in/natefinch/lumberjack.v2 v2.0.0
4543
helm.sh/helm/v3 v3.6.0
4644
k8s.io/api v0.23.1
4745
k8s.io/apimachinery v0.23.1
@@ -56,6 +54,7 @@ require (
5654
replace (
5755
github.com/labring/image-cri-shim => ./staging/src/github.com/labring/image-cri-shim
5856
github.com/labring/lvscare => ./staging/src/github.com/labring/lvscare
57+
github.com/labring/sealos => ../sealos
5958
)
6059

6160
replace github.com/vishvananda/netlink => github.com/vishvananda/netlink v1.1.0

‎go.sum

+21-7
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN
154154
github.com/aws/aws-sdk-go v1.34.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
155155
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
156156
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
157+
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
157158
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
158159
github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
159160
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -477,9 +478,8 @@ github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVB
477478
github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
478479
github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
479480
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
481+
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
480482
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
481-
github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
482-
github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
483483
github.com/fsouza/go-dockerclient v1.7.7/go.mod h1:njNCXvoZj3sLPjf3yO0DPHf1mdLdCPDYPc14GskKA4Y=
484484
github.com/fsouza/go-dockerclient v1.7.11 h1:pRmGMANAl+tmr+IYNYq8IWWcSbiKQMSRumYLv8H5sfk=
485485
github.com/fsouza/go-dockerclient v1.7.11/go.mod h1:zvYxutUNOK853i1s7VywZxQgxSHbm7A6en/q9MHBN6k=
@@ -510,8 +510,9 @@ github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTg
510510
github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
511511
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
512512
github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
513-
github.com/go-logr/logr v1.2.2 h1:ahHml/yUpnlb96Rp8HCvtYVPY8ZYpxq3g7UYchIYwbs=
514513
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
514+
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
515+
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
515516
github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI=
516517
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
517518
github.com/go-logr/zapr v0.4.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk=
@@ -694,6 +695,7 @@ github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3i
694695
github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU=
695696
github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw=
696697
github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA=
698+
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
697699
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
698700
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
699701
github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
@@ -793,6 +795,7 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
793795
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
794796
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
795797
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
798+
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
796799
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
797800
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
798801
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
@@ -1160,8 +1163,10 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf
11601163
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
11611164
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
11621165
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
1166+
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
11631167
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
11641168
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
1169+
github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
11651170
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
11661171
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
11671172
github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
@@ -1327,17 +1332,23 @@ go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0H
13271332
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
13281333
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
13291334
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
1335+
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
13301336
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
13311337
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
1338+
go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
1339+
go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
13321340
go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
13331341
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
13341342
go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
1343+
go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
13351344
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
13361345
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
13371346
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
13381347
go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
13391348
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
13401349
go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
1350+
go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=
1351+
go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
13411352
golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
13421353
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
13431354
golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -1390,6 +1401,7 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu
13901401
golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
13911402
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
13921403
golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
1404+
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
13931405
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
13941406
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
13951407
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
@@ -1403,6 +1415,7 @@ golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hM
14031415
golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
14041416
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
14051417
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
1418+
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
14061419
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
14071420
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
14081421
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1483,9 +1496,8 @@ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ
14831496
golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
14841497
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
14851498
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
1499+
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f h1:Qmd2pbz05z7z6lm0DrgQVVPuBm92jqujBKMHMOlOQEw=
14861500
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
1487-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg=
1488-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
14891501
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
14901502
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
14911503
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -1709,10 +1721,12 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
17091721
golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
17101722
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
17111723
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff/go.mod h1:YD9qOF0M9xpSpdWTBbzEl5e/RnCefISl8E5Noe10jFM=
1724+
golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
17121725
golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
17131726
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
17141727
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
17151728
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
1729+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
17161730
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
17171731
gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY=
17181732
google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
@@ -1868,9 +1882,9 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
18681882
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
18691883
gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
18701884
gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
1885+
gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
18711886
gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
1872-
gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI=
1873-
gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
1887+
gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
18741888
gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
18751889
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
18761890
gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=

‎pkg/auth/server.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package auth
1616

1717
import (
18-
"log"
1918
"net/http"
2019
"strconv"
2120

@@ -63,5 +62,5 @@ func httpServer() {
6362
logger.Info("start listening on localhost", authHTTPPortString)
6463
server := &http.Server{Addr: authHTTPPortString, Handler: container}
6564

66-
log.Fatal(server.ListenAndServe())
65+
logger.Fatal(server.ListenAndServe())
6766
}

‎pkg/filesystem/filesystem_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ package filesystem
3434
// wantErr: false,
3535
// },
3636
// }
37-
// logger.Cfg(false, true)
37+
// logger.CfgConsoleLogger(false, true)
3838
// for _, tt := range tests {
3939
// t.Run(tt.name, func(t *testing.T) {
4040
// f, _ := NewFilesystem(tt.fields.clusterName)

0 commit comments

Comments
 (0)