Merge pull request #16 from jkstack/dependabot/go_modules/google.golang.org/protobuf-1.33.0

Bump google.golang.org/protobuf from 1.31.0 to 1.33.0
2025-12-24 12:11:57 +08:00 · 2024-03-14 13:52:57 +08:00 · 2024-03-13 23:15:55 +00:00 · 2023-12-19 10:31:28 +08:00 · 2023-12-18 18:33:10 +08:00 · 2023-08-17 15:56:41 +08:00
6 changed files with 38 additions and 17 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,9 +19,8 @@ jobs:
          - macos-11
          - macos-12
        go:
-          - '1.18'
-          - '1.19'
          - '1.20'
+          - '1.21'
    steps:
      - uses: actions/checkout@v3

--- a/app.go
+++ b/app.go
@@ -107,6 +107,23 @@ func (app *app) stop() {

 func (app *app) initLogging() {
 	var cfg logging.SizeRotateConfig
+	logLevel, ok := os.LookupEnv("JKFRAME_LOG_LEVEL")
+	if ok {
+		switch logLevel {
+		case "debug":
+			cfg.Level = logging.LevelDebug
+		case "info":
+			cfg.Level = logging.LevelInfo
+		case "warn":
+			cfg.Level = logging.LevelWarn
+		case "error":
+			cfg.Level = logging.LevelError
+		default:
+			cfg.Level = logging.LevelInfo
+		}
+	} else {
+		cfg.Level = logging.LevelInfo
+	}
 	cfg.WriteStdout = app.a.Configure().Log.Target.SupportStdout()
 	cfg.WriteFile = app.a.Configure().Log.Target.SupportFile()
 	if rt.GOOS == "windows" {
--- a/app_report.go
+++ b/app_report.go
@@ -8,9 +8,13 @@ import (
 	"time"

 	"github.com/jkstack/anet"
+	"github.com/jkstack/jkframe/utils"
 )

 func (app *app) report() {
+	if app.a.Configure().Monitor.Interval <= 0 {
+		app.a.Configure().Monitor.Interval = utils.Duration(5 * time.Second)
+	}
 	for {
 		time.Sleep(app.a.Configure().Monitor.Interval.Duration())
 		if !app.connected {
--- a/dummy.go
+++ b/dummy.go
@@ -74,3 +74,7 @@ func (dm *DummyApp) OnMessage(*anet.Msg) error {
 func (dm *DummyApp) LoopWrite(context.Context, chan *anet.Msg) error {
 	return errUnsupported
 }
+
+// OnStop 服务退出信号
+func (dm *DummyApp) OnStop() {
+}
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/dustin/go-humanize v1.0.1
 	github.com/gorilla/websocket v1.5.0
 	github.com/jkstack/anet v0.0.0-20230207071751-5a225913e4b2
-	github.com/jkstack/jkframe v1.4.4
+	github.com/jkstack/jkframe v1.5.4
 	github.com/kardianos/service v1.2.1
 	github.com/opencontainers/runtime-spec v1.0.2
 	github.com/shirou/gopsutil/v3 v3.23.1
@@ -22,14 +22,14 @@ require (
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
-	github.com/klauspost/compress v1.15.11 // indirect
+	github.com/klauspost/compress v1.17.3 // indirect
 	github.com/lufia/plan9stats v0.0.0-20230110061619-bbe2e5e100de // indirect
 	github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.11 // indirect
 	github.com/tklauser/numcpus v0.6.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -19,8 +19,6 @@ github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiU
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
 github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -28,10 +26,10 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/jkstack/anet v0.0.0-20230207071751-5a225913e4b2 h1:3x4xZ9Ur9bu21wWJaAsdx0zq3BUS4o5pj1hp2lL0zo4=
 github.com/jkstack/anet v0.0.0-20230207071751-5a225913e4b2/go.mod h1:L9J4lHwDxTsCPX5MNaVa/0UG36JIiDWIJxlp3jmCQxQ=
-github.com/jkstack/jkframe v1.4.4 h1:/NJEaPC+0lXG8MwIKxfgPqAeASSaclHfyG3kbOBiBPc=
-github.com/jkstack/jkframe v1.4.4/go.mod h1:9f/mU26CFA4eBx/Zp8EZtuZxTS+4zokiO7yhuMl2zTA=
-github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c=
-github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
+github.com/jkstack/jkframe v1.5.4 h1:gX2pg+6MOcWhSuYsju+kwTH87t9JwMs5O0w1RDvAIRU=
+github.com/jkstack/jkframe v1.5.4/go.mod h1:P6G+spHi/0hDgDnnIsLjbOa8i2DzNwJXQECRqn2ieRA=
+github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA=
+github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
@@ -72,12 +70,11 @@ golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
Author	SHA1	Message	Date
lwch	91937861ef	Merge pull request #16 from jkstack/dependabot/go_modules/google.golang.org/protobuf-1.33.0 Bump google.golang.org/protobuf from 1.31.0 to 1.33.0	2024-03-14 13:52:57 +08:00
dependabot[bot]	9e6e32e901	Bump google.golang.org/protobuf from 1.31.0 to 1.33.0 Bumps google.golang.org/protobuf from 1.31.0 to 1.33.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2024-03-13 23:15:55 +00:00
lwch	1d4d763c46	修改actions脚本	2023-12-19 10:31:28 +08:00
lwch	9770e6ae3d	升级jkframe库	2023-12-18 18:33:10 +08:00
lwch	110c0403ce	DummyApp对象增加OnStop接口	2023-08-17 15:56:41 +08:00
lwch	c98ad2e329	修正监控频率设置过低时CPU占用率过高的问题	2023-08-17 15:52:01 +08:00