From 736dbff17d0db4416e3a792c418b96c231951c8b Mon Sep 17 00:00:00 2001 From: luorijun Date: Wed, 5 Mar 2025 18:12:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9F=BA=E7=A1=80=E6=80=A7?= =?UTF-8?q?=E8=83=BD=E6=B5=8B=E8=AF=95=E5=88=86=E6=9E=90=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/mock/main.go | 49 +++++++ go.mod | 11 ++ go.sum | 28 ++++ .../env}/dev/docker-compose.yaml | 0 .../env}/test/docker-compose.yaml | 9 +- .../env}/test/vector/Dockerfile | 2 +- .../env}/test/vector/vector.toml | 0 {config => scripts}/sql/init.sql | 0 server/fwd/fwd.go | 2 +- server/server.go | 11 ++ template/service/service.go | 135 ------------------ 11 files changed, 106 insertions(+), 141 deletions(-) create mode 100644 cmd/mock/main.go rename {config => scripts/env}/dev/docker-compose.yaml (100%) rename {config => scripts/env}/test/docker-compose.yaml (90%) rename {config => scripts/env}/test/vector/Dockerfile (70%) rename {config => scripts/env}/test/vector/vector.toml (100%) rename {config => scripts}/sql/init.sql (100%) delete mode 100644 template/service/service.go diff --git a/cmd/mock/main.go b/cmd/mock/main.go new file mode 100644 index 0000000..bb6fc81 --- /dev/null +++ b/cmd/mock/main.go @@ -0,0 +1,49 @@ +package main + +import ( + "math" + "math/rand" + "net/http" + "net/url" + "time" + + vegeta "github.com/tsenart/vegeta/lib" +) + +func main() { + go func() { + http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { + waiting := rand.Intn(450) + 50 + time.Sleep(time.Duration(waiting) * time.Millisecond) + w.Write([]byte("Hello World")) + }) + + err := http.ListenAndServe(":8080", nil) + if err != nil { + panic(err) + } + }() + + targeter := vegeta.NewStaticTargeter(vegeta.Target{ + Method: "GET", + URL: "http://localhost:8080", + }) + + rate := vegeta.Rate{Freq: 500, Per: time.Second} + + duration := 5 * time.Second + + attacker := vegeta.NewAttacker() + + vegeta.Proxy(func(request *http.Request) (*url.URL, error) { + return url.Parse("http://test-api.imfree.site:20001") + })(attacker) + + result := attacker.Attack(targeter, rate, duration, "test") + + maxNum := 0 + for res := range result { + math.Max(float64(res.Latency.Milliseconds()), float64(maxNum)) + } + println(maxNum) +} diff --git a/go.mod b/go.mod index 48ee8da..dccc52b 100644 --- a/go.mod +++ b/go.mod @@ -9,15 +9,20 @@ require ( github.com/mattn/go-colorable v0.1.14 github.com/pkg/errors v0.9.1 github.com/soheilhy/cmux v0.1.5 + github.com/tsenart/vegeta v11.4.0+incompatible gorm.io/driver/postgres v1.5.11 gorm.io/gen v0.3.26 gorm.io/gorm v1.25.12 ) require ( + github.com/bmizerany/perks v0.0.0-20230307044200-03f9df79da1e // indirect github.com/bytedance/sonic v1.12.8 // indirect github.com/bytedance/sonic/loader v0.2.3 // indirect + github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 // indirect github.com/cloudwego/base64x v0.1.5 // indirect + github.com/dgryski/go-gk v0.0.0-20200319235926-a69029f61654 // indirect + github.com/dgryski/go-lttb v0.0.0-20230207170358-f8fc36cdbff1 // indirect github.com/gabriel-vasile/mimetype v1.4.8 // indirect github.com/gin-contrib/sse v1.0.0 // indirect github.com/go-playground/locales v0.14.1 // indirect @@ -25,25 +30,31 @@ require ( github.com/go-playground/validator/v10 v10.22.0 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/goccy/go-json v0.10.5 // indirect + github.com/influxdata/tdigest v0.0.1 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect github.com/jackc/pgx/v5 v5.5.5 // indirect github.com/jackc/puddle/v2 v2.2.1 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect + github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.2.9 // indirect github.com/kr/text v0.2.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect + github.com/mailru/easyjson v0.9.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.2.3 // indirect github.com/rogpeppe/go-internal v1.13.1 // indirect + github.com/streadway/quantile v0.0.0-20220407130108-4246515d968d // indirect + github.com/tsenart/go-tsz v0.0.0-20180814235614-0bd30b3df1c3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect golang.org/x/arch v0.14.0 // indirect golang.org/x/crypto v0.33.0 // indirect + golang.org/x/exp v0.0.0-20220927162542-c76eaa363f9d // indirect golang.org/x/mod v0.22.0 // indirect golang.org/x/net v0.35.0 // indirect golang.org/x/sync v0.11.0 // indirect diff --git a/go.sum b/go.sum index f9c1dac..fe0ca16 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,12 @@ +github.com/bmizerany/perks v0.0.0-20230307044200-03f9df79da1e h1:mWOqoK5jV13ChKf/aF3plwQ96laasTJgZi4f1aSOu+M= +github.com/bmizerany/perks v0.0.0-20230307044200-03f9df79da1e/go.mod h1:ac9efd0D1fsDb3EJvhqgXRbFx7bs2wqZ10HQPeU8U/Q= github.com/bytedance/sonic v1.12.8 h1:4xYRVRlXIgvSZ4e8iVTlMF5szgpXd4AfvuWgA8I8lgs= github.com/bytedance/sonic v1.12.8/go.mod h1:uVvFidNmlt9+wa31S1urfwwthTWteBgG0hWuoKAXTx8= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= github.com/bytedance/sonic/loader v0.2.3 h1:yctD0Q3v2NOGfSWPLPvG2ggA2kV6TS6s4wioyEqssH0= github.com/bytedance/sonic/loader v0.2.3/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= +github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 h1:6lhrsTEnloDPXyeZBvSYvQf8u86jbKehZPVDDlkgDl4= +github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4= github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= @@ -10,6 +14,10 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgryski/go-gk v0.0.0-20200319235926-a69029f61654 h1:XOPLOMn/zT4jIgxfxSsoXPxkrzz0FaCHwp33x5POJ+Q= +github.com/dgryski/go-gk v0.0.0-20200319235926-a69029f61654/go.mod h1:qm+vckxRlDt0aOla0RYJJVeqHZlWfOm2UIxHaqPB46E= +github.com/dgryski/go-lttb v0.0.0-20230207170358-f8fc36cdbff1 h1:dxwR3CStJdJamsIoMPCmxuIfBAPTgmzvFax+MvFav3M= +github.com/dgryski/go-lttb v0.0.0-20230207170358-f8fc36cdbff1/go.mod h1:UwftcHUI/qTYvLAxrWmANuRckf8+08O3C3hwStvkhDU= github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM= github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8= github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E= @@ -33,9 +41,12 @@ github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0kt github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/influxdata/tdigest v0.0.1 h1:XpFptwYmnEKUqmkcDjrzffswZ3nvNeevbUSLPP/ZzIY= +github.com/influxdata/tdigest v0.0.1/go.mod h1:Z0kXnxzbTC2qrx4NaIzYkE1k66+6oEDQTvL95hQFh5Y= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= @@ -52,6 +63,8 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= @@ -66,6 +79,8 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/lmittmann/tint v1.0.7 h1:D/0OqWZ0YOGZ6AyC+5Y2kD8PBEzBk6rFHVSfOqCkF9Y= github.com/lmittmann/tint v1.0.7/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= +github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4= +github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU= github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= @@ -90,6 +105,8 @@ github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= +github.com/streadway/quantile v0.0.0-20220407130108-4246515d968d h1:X4+kt6zM/OVO6gbJdAfJR60MGPsqCzbtXNnjoGqdfAs= +github.com/streadway/quantile v0.0.0-20220407130108-4246515d968d/go.mod h1:lbP8tGiBjZ5YWIc2fzuRpTaz0b/53vT6PEs3QuAWzuU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -102,6 +119,10 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/tsenart/go-tsz v0.0.0-20180814235614-0bd30b3df1c3 h1:pcQGQzTwCg//7FgVywqge1sW9Yf8VMsMdG58MI5kd8s= +github.com/tsenart/go-tsz v0.0.0-20180814235614-0bd30b3df1c3/go.mod h1:SWZznP1z5Ki7hDT2ioqiFKEse8K9tU2OUvaRI0NeGQo= +github.com/tsenart/vegeta v11.4.0+incompatible h1:VJjC5xPmxymgIIzHgUsYTE0xVoBSikw1mIOsSgUSWx4= +github.com/tsenart/vegeta v11.4.0+incompatible/go.mod h1:Smz/ZWfhKRcyDDChZkG3CyTHdj87lHzio/HOCkbndXM= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= @@ -112,6 +133,9 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= +golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20220927162542-c76eaa363f9d h1:3wgmvnqHUJ8SxiNWwea5NCzTwAVfhTtuV+0ClVFlClc= +golang.org/x/exp v0.0.0-20220927162542-c76eaa363f9d/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -130,9 +154,13 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= +golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= +gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca h1:PupagGYwj8+I4ubCxcmcBRk3VlUWtTg5huQpZR9flmE= +gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= +gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/config/dev/docker-compose.yaml b/scripts/env/dev/docker-compose.yaml similarity index 100% rename from config/dev/docker-compose.yaml rename to scripts/env/dev/docker-compose.yaml diff --git a/config/test/docker-compose.yaml b/scripts/env/test/docker-compose.yaml similarity index 90% rename from config/test/docker-compose.yaml rename to scripts/env/test/docker-compose.yaml index 314cc58..1941188 100644 --- a/config/test/docker-compose.yaml +++ b/scripts/env/test/docker-compose.yaml @@ -20,8 +20,8 @@ services: service: container_name: proxy-server-dev-service build: - context: ../.. - dockerfile: Dockerfile + context: ../../.. + dockerfile: ../../../Dockerfile environment: APP_CTRL_PORT: $APP_CTRL_PORT APP_DATA_PORT: $APP_DATA_PORT @@ -35,6 +35,7 @@ services: ports: - "${APP_CTRL_PORT}:${APP_CTRL_PORT}" - "${APP_DATA_PORT}:${APP_DATA_PORT}" + - "6060:6060" - "20000-20100:20000-20100" networks: - proxy-server-test @@ -45,8 +46,8 @@ services: vector: container_name: proxy-server-dev-vector build: - context: ./vector - dockerfile: Dockerfile + context: vector + dockerfile: vector/Dockerfile ports: - "8686:8686" volumes: diff --git a/config/test/vector/Dockerfile b/scripts/env/test/vector/Dockerfile similarity index 70% rename from config/test/vector/Dockerfile rename to scripts/env/test/vector/Dockerfile index 70ff899..e011b93 100644 --- a/config/test/vector/Dockerfile +++ b/scripts/env/test/vector/Dockerfile @@ -1,6 +1,6 @@ FROM timberio/vector:0.45.0-debian # Copy the configuration file -COPY ./vector.toml /etc/vector/vector.toml +COPY vector.toml /etc/vector/vector.toml CMD ["-c", "/etc/vector/vector.toml"] \ No newline at end of file diff --git a/config/test/vector/vector.toml b/scripts/env/test/vector/vector.toml similarity index 100% rename from config/test/vector/vector.toml rename to scripts/env/test/vector/vector.toml diff --git a/config/sql/init.sql b/scripts/sql/init.sql similarity index 100% rename from config/sql/init.sql rename to scripts/sql/init.sql diff --git a/server/fwd/fwd.go b/server/fwd/fwd.go index 186fd16..a94d4c9 100644 --- a/server/fwd/fwd.go +++ b/server/fwd/fwd.go @@ -107,7 +107,7 @@ func (s *Service) Run() { // 清理资源 s.userConnMap.Range(func(key, value any) bool { - conn := value.(core.Conn) + conn := value.(*core.Conn) utils.Close(conn) return true }) diff --git a/server/server.go b/server/server.go index f3a0fb6..968cdbf 100644 --- a/server/server.go +++ b/server/server.go @@ -3,6 +3,7 @@ package server import ( "context" "log/slog" + "net/http" "os" "os/signal" "proxy-server/pkg/utils" @@ -17,6 +18,8 @@ import ( "github.com/joho/godotenv" ) +import _ "net/http/pprof" + type Context struct { context.Context log *slog.Logger @@ -34,6 +37,14 @@ func Start() { env.Init() orm.Init() + // 性能监控 + go func() { + err := http.ListenAndServe(":6060", nil) + if err != nil { + slog.Error("性能监控服务发生错误", "err", err) + } + }() + // 退出信号 osQuit := make(chan os.Signal) signal.Notify(osQuit, os.Interrupt, syscall.SIGTERM) diff --git a/template/service/service.go b/template/service/service.go deleted file mode 100644 index efc1b45..0000000 --- a/template/service/service.go +++ /dev/null @@ -1,135 +0,0 @@ -package service - -import ( - "context" - "errors" - "io" - "log" - "net" - "strconv" - "sync" - "time" -) - -type Config struct { - Host string - Port uint16 - CloseWait time.Duration -} - -type Server struct { - config *Config - ctx context.Context - cancel context.CancelFunc - wg sync.WaitGroup -} - -func New(conf *Config) (*Server, error) { - - if conf.Host == "" { - conf.Host = "localhost" - } - if conf.Port == 0 { - return nil, errors.New("port is required") - } - - ctx, cancel := context.WithCancel(context.Background()) - return &Server{ - conf, - ctx, - cancel, - sync.WaitGroup{}, - }, nil -} - -func (s *Server) Run() error { - - // start listen - addr := net.JoinHostPort(s.config.Host, strconv.Itoa(int(s.config.Port))) - ls, err := net.Listen("tcp", addr) - if err != nil { - return errors.New("failed to listen") - } - defer closeRes(ls) - - // wait accept - connCh := make(chan net.Conn) - defer close(connCh) - go func() { - for { - conn, err := ls.Accept() - if err != nil { - if !errors.Is(err, net.ErrClosed) { - log.Println("accept failed", err) - } - // retry on temporary error - var ne net.Error - if errors.As(err, &ne) && ne.Temporary() { - continue - } - return - } - select { - case <-s.ctx.Done(): - closeRes(conn) - return - case connCh <- conn: - } - } - }() - - // handle accept - func() { - for { - select { - case <-s.ctx.Done(): - return - case conn, ok := <-connCh: - if !ok { - return - } - s.wg.Add(1) - go func() { - defer s.wg.Done() - _ = s.handle(conn) - }() - } - } - }() - - // close - timeout, cancel := context.WithTimeout(context.Background(), s.config.CloseWait) - defer cancel() - - waitCh := make(chan struct{}) - defer close(waitCh) - go func() { - s.wg.Wait() - select { - case <-timeout.Done(): // waitCh may be closed - case waitCh <- struct{}{}: - } - }() - - err = nil - select { - case <-timeout.Done(): - err = errors.New("close timeout") - case <-waitCh: - } - - return err -} - -func (s *Server) Close() { - s.cancel() -} - -func (s *Server) handle(conn net.Conn) error { - defer closeRes(conn) - return nil -} - -func closeRes[T io.Closer](res T) { - _ = res.Close() -}