Merge pull request #101 from ferryproxy/clean/dependency

Clean dependency

Author: wzshiming

go.mod

@@ -12,7 +12,6 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/wzshiming/anyproxy v0.7.6
 	github.com/wzshiming/bridge v0.8.5
-	github.com/wzshiming/notify v0.1.1
 	go.uber.org/zap v1.21.0
 	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
 	k8s.io/api v0.24.2
@@ -31,7 +30,6 @@ require (
 	github.com/go-openapi/swag v0.21.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/gnostic v0.6.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
@@ -44,7 +42,6 @@ require (
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/wzshiming/cmux v0.3.0 // indirect
 	github.com/wzshiming/commandproxy v0.2.0 // indirect
-	github.com/wzshiming/emux v0.2.1 // indirect
 	github.com/wzshiming/hostmatcher v0.0.1 // indirect
 	github.com/wzshiming/httpproxy v0.4.1 // indirect
 	github.com/wzshiming/schedialer v0.2.1 // indirect

go.sum

@@ -209,8 +209,6 @@ github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
-github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
@@ -444,14 +442,10 @@ github.com/wzshiming/cmux v0.3.0 h1:OsALDnhubCbqI+wqayn/DOD5OX0ebcQdHNN4xgY2h14=
 github.com/wzshiming/cmux v0.3.0/go.mod h1:TGi/uEBvRkO5+INEwBHiBtqdNWK+wS+OvvS7XtIf4bQ=
 github.com/wzshiming/commandproxy v0.2.0 h1:uPVhgIj2YSncRUo6g9smGR6OMzsIg7lwklcMHPPmEeM=
 github.com/wzshiming/commandproxy v0.2.0/go.mod h1:wS6+aJ9KMHciqYX3xmDO0W+QVY0zvngeBvmoIFMfq8A=
-github.com/wzshiming/emux v0.2.1 h1:pu0oV9PpAJ5cVO8tzkqUXcCqc8xC452vNzQK9cghUis=
-github.com/wzshiming/emux v0.2.1/go.mod h1:VQF6NoR4nfm3+OrKZLx47JuxuDeWemHDc0a4qDNtFtg=
 github.com/wzshiming/hostmatcher v0.0.1 h1:vPrUEXsd+khvN5W7I4rJ73vYaUvnBCodvtuyCU+q1HQ=
 github.com/wzshiming/hostmatcher v0.0.1/go.mod h1:3EyfIDuzQyo0tqrCtcUkD5UvAsdxOUb/RbcYOiPTh1E=
 github.com/wzshiming/httpproxy v0.4.1 h1:6K78q0Vi+/GM4h9KygTGi7nuVn5Xgk5oHqjJyaGLHcQ=
 github.com/wzshiming/httpproxy v0.4.1/go.mod h1:drZR+iQLfYsQi7/nETLjyB9Z0f5KDXQo2PEkJBbg3xQ=
-github.com/wzshiming/notify v0.1.1 h1:rJXoszrkNglhCVyn/IfW500f5cW03q1q7YzL8hsLchI=
-github.com/wzshiming/notify v0.1.1/go.mod h1:SFhsQKZJznzsDcj/Qfo9A65k5IRcpUrpgbLRzZEa/DI=
 github.com/wzshiming/schedialer v0.2.1 h1:DnAv8ta2UuWcvRy9sYwSt69rTuE3/kiCgwX6CiN5y4M=
 github.com/wzshiming/schedialer v0.2.1/go.mod h1:TvVxg4QZIBTJzRfmL/G7g6CzynFQKPmtXtSeJ2c4Lus=
 github.com/wzshiming/shadowsocks v0.3.1 h1:K35RBGrn8OM1XwvpWOCeHGsbb0ZpQTOuBCO4GlQ6ISA=

pkg/ferry-tunnel/controller/runtime_controller.go

@@ -30,7 +30,6 @@ import (
 
 	"github.com/ferryproxy/ferry/pkg/utils/trybuffer"
 	"github.com/go-logr/logr"
-	"github.com/wzshiming/notify"
 	"k8s.io/client-go/kubernetes"
 )
 
@@ -83,12 +82,10 @@ func (r *RuntimeController) Run(ctx context.Context) error {
 
 	go r.watch(ctx)
 
-	signals := []os.Signal{syscall.SIGINT, syscall.SIGTERM}
-	notify.OnceSlice(signals, func() {
-		r.mut.Lock()
-		defer r.mut.Unlock()
+	go func() {
+		<-ctx.Done()
 		r.cmd.Process.Signal(syscall.SIGTERM)
-	})
+	}()
 
 	r.logger.Info("Start ferry tunnel")
 	for ctx.Err() == nil {