From f6619072689228e3f9183e34208fbf2a16e12542 Mon Sep 17 00:00:00 2001 From: yusing Date: Sat, 29 Mar 2025 16:44:23 +0800 Subject: [PATCH] refactor(agent): streamline certificate and server handling in StartAgentServer function --- agent/pkg/server/server.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/agent/pkg/server/server.go b/agent/pkg/server/server.go index 9d6c336..be0ac1d 100644 --- a/agent/pkg/server/server.go +++ b/agent/pkg/server/server.go @@ -3,7 +3,6 @@ package server import ( "crypto/tls" "crypto/x509" - "encoding/pem" "fmt" "net/http" @@ -20,11 +19,8 @@ type Options struct { } func StartAgentServer(parent task.Parent, opt Options) { - t := parent.Subtask("agent_server") - - caCertPEM := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: opt.CACert.Certificate[0]}) caCertPool := x509.NewCertPool() - caCertPool.AppendCertsFromPEM(caCertPEM) + caCertPool.AddCert(opt.CACert.Leaf) // Configure TLS tlsConfig := &tls.Config{ @@ -44,8 +40,5 @@ func StartAgentServer(parent task.Parent, opt Options) { TLSConfig: tlsConfig, } - server.Start(t, agentServer, logger) - t.OnCancel("stop", func() { - server.Stop(agentServer, logger) - }) + server.Start(parent, agentServer, logger) }