From a4b5656dc50dc5ecdc94f4d5dd7fb7654336ade8 Mon Sep 17 00:00:00 2001 From: arm64v8a <48624112+arm64v8a@users.noreply.github.com> Date: Tue, 16 May 2023 09:45:50 +0900 Subject: [PATCH] force limit core log rate --- go/cmd/nekobox_core/go.mod | 2 +- go/cmd/nekobox_core/go.sum | 4 ++-- go/cmd/nekoray_core/go.mod | 5 +++-- go/cmd/nekoray_core/go.sum | 4 ++-- go/cmd/nekoray_core/toolbox_linux.go | 18 ++++++++---------- go/grpc_server/go.mod | 5 ++++- go/grpc_server/go.sum | 4 ++-- go/grpc_server/grpc.go | 5 +++++ libs/get_source_env.sh | 2 +- 9 files changed, 28 insertions(+), 21 deletions(-) diff --git a/go/cmd/nekobox_core/go.mod b/go/cmd/nekobox_core/go.mod index d2fb155..a23d487 100644 --- a/go/cmd/nekobox_core/go.mod +++ b/go/cmd/nekobox_core/go.mod @@ -82,7 +82,7 @@ require ( golang.org/x/net v0.9.0 // indirect golang.org/x/sys v0.7.0 // indirect golang.org/x/text v0.9.0 // indirect - golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect + golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.6.0 // indirect golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 // indirect google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect diff --git a/go/cmd/nekobox_core/go.sum b/go/cmd/nekobox_core/go.sum index d6f42ec..4909e42 100644 --- a/go/cmd/nekobox_core/go.sum +++ b/go/cmd/nekobox_core/go.sum @@ -262,8 +262,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= -golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= diff --git a/go/cmd/nekoray_core/go.mod b/go/cmd/nekoray_core/go.mod index f4daaae..5288d8a 100644 --- a/go/cmd/nekoray_core/go.mod +++ b/go/cmd/nekoray_core/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/Dreamacro/clash v1.9.0 github.com/jsimonetti/rtnetlink v1.2.2 - github.com/matsuridayo/libneko v0.0.0-20230304130313-5ea96b79b3c3 + github.com/matsuridayo/libneko v1.0.0 // replaced github.com/v2fly/v2ray-core/v5 v5.0.0 // replaced grpc_server v1.0.0 kernel.org/pub/linux/libs/security/libcap/cap v1.2.65 @@ -67,6 +67,7 @@ require ( golang.org/x/sync v0.1.0 // indirect golang.org/x/sys v0.3.0 // indirect golang.org/x/text v0.5.0 // indirect + golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.2.0 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/appengine v1.6.7 // indirect @@ -76,7 +77,7 @@ require ( kernel.org/pub/linux/libs/security/libcap/psx v1.2.65 // indirect ) -replace neko v1.0.0 => ../../neko +replace github.com/matsuridayo/libneko v1.0.0 => ../../../../libneko replace grpc_server v1.0.0 => ../../grpc_server diff --git a/go/cmd/nekoray_core/go.sum b/go/cmd/nekoray_core/go.sum index 4374c89..0f9fd10 100644 --- a/go/cmd/nekoray_core/go.sum +++ b/go/cmd/nekoray_core/go.sum @@ -249,8 +249,6 @@ github.com/lunixbochs/struc v0.0.0-20190916212049-a5c72983bc42/go.mod h1:vy1vK6w github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc= github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/matsuridayo/libneko v0.0.0-20230304130313-5ea96b79b3c3 h1:emqnGHIlezKjm24Lz5aos9Lc1bhxFL8Ynp20EprSNJc= -github.com/matsuridayo/libneko v0.0.0-20230304130313-5ea96b79b3c3/go.mod h1:IRO07Queptz/rGFvEW+3Hmwpx7MCup6WiDs4p5jMt4g= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -574,6 +572,8 @@ golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/go/cmd/nekoray_core/toolbox_linux.go b/go/cmd/nekoray_core/toolbox_linux.go index 117223f..19fc333 100644 --- a/go/cmd/nekoray_core/toolbox_linux.go +++ b/go/cmd/nekoray_core/toolbox_linux.go @@ -9,8 +9,6 @@ import ( "os" "syscall" - "github.com/matsuridayo/libneko/protect_server" - "github.com/jsimonetti/rtnetlink" linuxcap "kernel.org/pub/linux/libs/security/libcap/cap" ) @@ -59,14 +57,14 @@ func ToolBox() { log.Println(set) } } - case "protect": - { - if protectListenPath == "" { - log.Println("missing protect-listen-path") - return - } - protect_server.ServeProtect(protectListenPath, protectFwMark) - } + // case "protect": + // { + // if protectListenPath == "" { + // log.Println("missing protect-listen-path") + // return + // } + // protect_server.ServeProtect(protectListenPath, protectFwMark) + // } case "btd": // Test the permission { d := &net.Dialer{ diff --git a/go/grpc_server/go.mod b/go/grpc_server/go.mod index fd01fec..2b4e2d0 100644 --- a/go/grpc_server/go.mod +++ b/go/grpc_server/go.mod @@ -4,7 +4,8 @@ go 1.19 require ( github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 - github.com/matsuridayo/libneko v0.0.0-20230304130313-5ea96b79b3c3 + github.com/matsuridayo/libneko v1.0.0 // replaced + golang.org/x/time v0.3.0 google.golang.org/grpc v1.49.0 google.golang.org/protobuf v1.28.1 ) @@ -17,3 +18,5 @@ require ( golang.org/x/text v0.3.7 // indirect google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb // indirect ) + +replace github.com/matsuridayo/libneko v1.0.0 => ../../../libneko diff --git a/go/grpc_server/go.sum b/go/grpc_server/go.sum index aa9f760..c376898 100644 --- a/go/grpc_server/go.sum +++ b/go/grpc_server/go.sum @@ -56,8 +56,6 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/matsuridayo/libneko v0.0.0-20230304130313-5ea96b79b3c3 h1:emqnGHIlezKjm24Lz5aos9Lc1bhxFL8Ynp20EprSNJc= -github.com/matsuridayo/libneko v0.0.0-20230304130313-5ea96b79b3c3/go.mod h1:IRO07Queptz/rGFvEW+3Hmwpx7MCup6WiDs4p5jMt4g= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -126,6 +124,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= diff --git a/go/grpc_server/grpc.go b/go/grpc_server/grpc.go index 772dd60..b33cec2 100644 --- a/go/grpc_server/grpc.go +++ b/go/grpc_server/grpc.go @@ -17,9 +17,12 @@ import ( "time" "github.com/matsuridayo/libneko/neko_common" + "github.com/matsuridayo/libneko/neko_log" grpc_auth "github.com/grpc-ecosystem/go-grpc-middleware/auth" "google.golang.org/grpc" + + "golang.org/x/time/rate" ) type BaseServer struct { @@ -41,6 +44,8 @@ func RunCore(setupCore func(), server gen.LibcoreServiceServer) { flag.CommandLine.Parse(os.Args[2:]) neko_common.Debug = *_debug + neko_log.RateLimiter = rate.NewLimiter(rate.Limit(100), 150) + neko_log.RateLimitExit = true go func() { parent, err := os.FindProcess(os.Getppid()) diff --git a/libs/get_source_env.sh b/libs/get_source_env.sh index c714507..fde9ff9 100644 --- a/libs/get_source_env.sh +++ b/libs/get_source_env.sh @@ -1,5 +1,5 @@ if [ ! -z $ENV_NEKORAY ]; then - export COMMIT_SING_BOX_EXTRA="d663cfa6b9f721d306ec3972460b61bb2c935685" + export COMMIT_SING_BOX_EXTRA="4768132c35fb9d92e4e9914b15391f29fad4821a" export COMMIT_MATSURI_V2RAY="8134d3cc23aa6b8e2a056887addf22d7d22bd969" fi