fix(ss): udp problem

mzz2017 · Jan 27, 2023 · de672d0 · de672d0
1 parent b42da8d
commit de672d0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -46,7 +46,7 @@ $ gg git clone https://github.com/mzz2017/gg.git`)
 				}
 			}
 			// initiate config from args and config file
-			log := GetLogger(verbose)
+			log := NewLogger(verbose)
 			log.Traceln("Version:", Version)
 			log.Tracef("OS/Arch: %v/%v\n", runtime.GOOS, runtime.GOARCH)
 			v, _ = getConfig(log, true, viper.New, cmd)
@@ -143,7 +143,7 @@ func init() {
 	rootCmd.AddCommand(configCmd)
 }
 
-func GetLogger(verbose int) *logrus.Logger {
+func NewLogger(verbose int) *logrus.Logger {
 	log := logrus.New()
 
 	var level logrus.Level

diff --git a/common/util.go b/common/util.go
@@ -116,7 +116,7 @@ func Max(a, b int) int {
 	return b
 }
 
-func MustMapKeys(m interface{}) (keys []string) {
+func MustGetMapKeys(m interface{}) (keys []string) {
 	v := reflect.ValueOf(m)
 	vKeys := v.MapKeys()
 	for _, k := range vKeys {

diff --git a/config/bind.go b/config/bind.go
@@ -49,7 +49,7 @@ func (b *Binder) Bind(iface interface{}) error {
 			}
 		}
 		if !changed {
-			return fmt.Errorf("%v: %w", strings.Join(common.MustMapKeys(b.toResolve), ", "), ErrMutualReference)
+			return fmt.Errorf("%v: %w", strings.Join(common.MustGetMapKeys(b.toResolve), ", "), ErrMutualReference)
 		}
 	}
 	return nil

diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/fatih/structs v1.1.0
 	github.com/gorilla/websocket v1.4.2
 	github.com/json-iterator/go v1.1.12
-	github.com/mzz2017/softwind v0.0.0-20221204151826-2987e0b05820
+	github.com/mzz2017/softwind v0.0.0-20230127172609-05c5264aa6a4
 	github.com/nadoo/glider v0.16.2
 	github.com/pelletier/go-toml v1.9.4
 	github.com/sirupsen/logrus v1.8.1

diff --git a/go.sum b/go.sum
@@ -287,8 +287,8 @@ github.com/mzz2017/disk-bloom v1.0.1 h1:rEF9MiXd9qMW3ibRpqcerLXULoTgRlM21yqqJl1B
 github.com/mzz2017/disk-bloom v1.0.1/go.mod h1:JLHETtUu44Z6iBmsqzkOtFlRvXSlKnxjwiBRDapizDI=
 github.com/mzz2017/pflag v0.0.0-20211204030847-74e9419ee6b3 h1:i+hUSMSd8hBlPt1zDcbj0lap7Ct7TFZ++At8CqLConE=
 github.com/mzz2017/pflag v0.0.0-20211204030847-74e9419ee6b3/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/mzz2017/softwind v0.0.0-20221204151826-2987e0b05820 h1:kFOj4IouU0Ksdtc/cMnMTdqytDG3HlIRjM4lhLDa530=
-github.com/mzz2017/softwind v0.0.0-20221204151826-2987e0b05820/go.mod h1:K1nXwtBokwEsfOfdT/5zV6R8QabGkyhcR0iuTrRZcYY=
+github.com/mzz2017/softwind v0.0.0-20230127172609-05c5264aa6a4 h1:A5SQXPnd96JTjUusEZ2U+KTo7sQeAu8q38iu6TPhl2o=
+github.com/mzz2017/softwind v0.0.0-20230127172609-05c5264aa6a4/go.mod h1:K1nXwtBokwEsfOfdT/5zV6R8QabGkyhcR0iuTrRZcYY=
 github.com/nadoo/glider v0.16.2 h1:lF+Bj+Q58UwFcO4cna0lSjemxaN0bc96OdIOndcFNJM=
 github.com/nadoo/glider v0.16.2/go.mod h1:TfmgWSCINk+zrgiu4AW09Z5+4pzTXJdPq4+ifIV2ALw=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=