From 1f8efd663c1a938006568fba408370f0583bab2e Mon Sep 17 00:00:00 2001 From: reesporte Date: Fri, 4 Feb 2022 16:04:19 -0600 Subject: [PATCH 1/3] log index with query for grpc --- server/grpc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/grpc.go b/server/grpc.go index bd72dda9e..f54a3292f 100644 --- a/server/grpc.go +++ b/server/grpc.go @@ -1645,7 +1645,7 @@ func LogQuery(ctx context.Context, method string, req interface{}, logger logger } switch r := req.(type) { case *pb.QueryPQLRequest: - logger.Infof("GRPC: %v, %v, %v, %v, %v, %s", ip, ua, method, uinfo.UserID, uinfo.UserName, r.Pql) + logger.Infof("GRPC: %v, %v, %v, %v, %v, [%s]%s", ip, ua, method, uinfo.UserID, uinfo.UserName, r.Index, r.Pql) case *pb.QuerySQLRequest: logger.Infof("GRPC: %v, %v, %v, %v, %v, %s", ip, ua, method, uinfo.UserID, uinfo.UserName, r.Sql) default: From ede85735dfa459e350e86e1d1097d23cb7e03896 Mon Sep 17 00:00:00 2001 From: reesporte Date: Fri, 4 Feb 2022 16:12:20 -0600 Subject: [PATCH 2/3] use nfpm 2.11.3 so CI doesn't break --- .gitlab/.gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 4e7d6f5db..4c0cb0c3b 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -216,7 +216,7 @@ package for linux amd64: GOARCH: "amd64" script: - echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | tee /etc/apt/sources.list.d/goreleaser.list - - apt update && apt install nfpm + - apt update && apt install nfpm=2.11.3 - make package artifacts: paths: @@ -233,7 +233,7 @@ package for linux arm64: GOARCH: "arm64" script: - echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | tee /etc/apt/sources.list.d/goreleaser.list - - apt update && apt install nfpm + - apt update && apt install nfpm=2.11.3 - make package artifacts: paths: From 8097e7dffdd284756b6d2874f1e484b5f0f49a36 Mon Sep 17 00:00:00 2001 From: reesporte Date: Fri, 4 Feb 2022 16:26:56 -0600 Subject: [PATCH 3/3] update test --- server/grpc_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/grpc_test.go b/server/grpc_test.go index 376b44ff2..99ce9faf1 100644 --- a/server/grpc_test.go +++ b/server/grpc_test.go @@ -1453,8 +1453,8 @@ func TestLogQuery(t *testing.T) { }, { name: "QueryPQLReq", - req: &pb.QueryPQLRequest{Pql: "Count(All())"}, - expected: fmt.Sprintf("GRPC: %v, %v, %v, %v, %v, %v\n", "", []string{}, "test!", uinfo.UserID, uinfo.UserName, "Count(All())"), + req: &pb.QueryPQLRequest{Index: "index", Pql: "Count(All())"}, + expected: fmt.Sprintf("GRPC: %v, %v, %v, %v, %v, %v\n", "", []string{}, "test!", uinfo.UserID, uinfo.UserName, "[index]Count(All())"), }, } for _, test := range cases {