From de8c51798f06698e0e4c2257683fd1ae59da3cec Mon Sep 17 00:00:00 2001 From: Sammy Oina Date: Thu, 9 Jan 2025 20:19:23 +0300 Subject: [PATCH] fix lint Signed-off-by: Sammy Oina --- agent/cvm/api/grpc/client.go | 2 +- agent/cvm/server/cvm.go | 4 ++-- cmd/agent/main.go | 6 +++--- internal/logger/protohandler.go | 1 - internal/logger/protohandler_test.go | 1 - 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/agent/cvm/api/grpc/client.go b/agent/cvm/api/grpc/client.go index 79118997..2e15cbe4 100644 --- a/agent/cvm/api/grpc/client.go +++ b/agent/cvm/api/grpc/client.go @@ -133,7 +133,7 @@ func (client *CVMClient) executeRun(ctx context.Context, runReq *cvm.Computation client.mu.Lock() defer client.mu.Unlock() - err := client.sp.Start(agent.AgentConfig{ + err := client.sp.Start(ctx, agent.AgentConfig{ Port: runReq.AgentConfig.Port, Host: runReq.AgentConfig.Host, CertFile: runReq.AgentConfig.CertFile, diff --git a/agent/cvm/server/cvm.go b/agent/cvm/server/cvm.go index 5f2b15b7..f7489773 100644 --- a/agent/cvm/server/cvm.go +++ b/agent/cvm/server/cvm.go @@ -36,7 +36,7 @@ func NewServerProvider(logger *slog.Logger, svc agent.Service) *AgentServer { } } -func (as *AgentServer) Start(cfg agent.AgentConfig, cmp agent.Computation) error { +func (as *AgentServer) Start(ctx context.Context, cfg agent.AgentConfig, cmp agent.Computation) error { if cfg.Port == "" { cfg.Port = defSvcGRPCPort } @@ -72,7 +72,7 @@ func (as *AgentServer) Start(cfg agent.AgentConfig, cmp agent.Computation) error return err } - ctx, cancel := context.WithCancel(context.Background()) + ctx, cancel := context.WithCancel(ctx) as.gs = grpcserver.New(ctx, cancel, svcName, agentGrpcServerConfig, registerAgentServiceServer, as.logger, qp, authSvc) diff --git a/cmd/agent/main.go b/cmd/agent/main.go index b2823672..a0585d84 100644 --- a/cmd/agent/main.go +++ b/cmd/agent/main.go @@ -44,14 +44,14 @@ func main() { ctx, cancel := context.WithCancel(context.Background()) g, ctx := errgroup.WithContext(ctx) - var exitCode int - defer mglog.ExitWithError(&exitCode) - var cfg config if err := env.Parse(&cfg); err != nil { log.Fatalf("failed to load %s configuration : %s", svcName, err) } + var exitCode int + defer mglog.ExitWithError(&exitCode) + var level slog.Level if err := level.UnmarshalText([]byte(cfg.LogLevel)); err != nil { log.Println(err) diff --git a/internal/logger/protohandler.go b/internal/logger/protohandler.go index 6bb9f888..0e64f9ed 100644 --- a/internal/logger/protohandler.go +++ b/internal/logger/protohandler.go @@ -96,7 +96,6 @@ func (h *handler) Handle(_ context.Context, r slog.Record) error { if err != nil { return err } - } return nil diff --git a/internal/logger/protohandler_test.go b/internal/logger/protohandler_test.go index af330693..feb82515 100644 --- a/internal/logger/protohandler_test.go +++ b/internal/logger/protohandler_test.go @@ -43,7 +43,6 @@ func TestHandleMessageSuccess(t *testing.T) { // TestHandleMessageFailure tests the caching mechanism when the write fails. func TestHandleMessageFailure(t *testing.T) { - protohandler := NewProtoHandler(&failedWriter{}, nil, make(chan *cvm.ClientStreamMessage, 1)) record := slog.Record{ Time: time.Now(),