From 73a5c57d67555592d616fe41c48a946183f28594 Mon Sep 17 00:00:00 2001
From: yusing <yusing@6uo.me>
Date: Sat, 5 Apr 2025 12:00:52 +0800
Subject: [PATCH] refactor(agent): update logging message format in agent
 initialization, rename Start* to Init*

---
 agent/pkg/agent/config.go     | 12 +++++-------
 internal/config/agent_pool.go |  2 +-
 internal/config/config.go     |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/agent/pkg/agent/config.go b/agent/pkg/agent/config.go
index d0ad293..29cb270 100644
--- a/agent/pkg/agent/config.go
+++ b/agent/pkg/agent/config.go
@@ -17,7 +17,6 @@ import (
 	"github.com/yusing/go-proxy/internal/logging"
 	gphttp "github.com/yusing/go-proxy/internal/net/gphttp"
 	"github.com/yusing/go-proxy/internal/net/types"
-	"github.com/yusing/go-proxy/internal/task"
 	"github.com/yusing/go-proxy/pkg"
 )
 
@@ -80,7 +79,7 @@ func checkVersion(a, b string) bool {
 	return withoutBuildTime(a) == withoutBuildTime(b)
 }
 
-func (cfg *AgentConfig) StartWithCerts(parent task.Parent, ca, crt, key []byte) error {
+func (cfg *AgentConfig) InitWithCerts(ctx context.Context, ca, crt, key []byte) error {
 	clientCert, err := tls.X509KeyPair(crt, key)
 	if err != nil {
 		return err
@@ -102,7 +101,7 @@ func (cfg *AgentConfig) StartWithCerts(parent task.Parent, ca, crt, key []byte)
 	// create transport and http client
 	cfg.httpClient = cfg.NewHTTPClient()
 
-	ctx, cancel := context.WithTimeout(parent.Context(), 5*time.Second)
+	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
 	defer cancel()
 
 	// check agent version
@@ -125,12 +124,11 @@ func (cfg *AgentConfig) StartWithCerts(parent task.Parent, ca, crt, key []byte)
 
 	cfg.name = string(name)
 	cfg.l = logging.With().Str("agent", cfg.name).Logger()
-
-	logging.Info().Msgf("agent %q initialized", cfg.name)
+	cfg.l.Info().Msg("agent initialized")
 	return nil
 }
 
-func (cfg *AgentConfig) Start(parent task.Parent) gperr.Error {
+func (cfg *AgentConfig) Init(ctx context.Context) gperr.Error {
 	filepath, ok := certs.AgentCertsFilepath(cfg.Addr)
 	if !ok {
 		return gperr.New("invalid agent host").Subject(cfg.Addr)
@@ -146,7 +144,7 @@ func (cfg *AgentConfig) Start(parent task.Parent) gperr.Error {
 		return gperr.Wrap(err, "failed to extract agent certs")
 	}
 
-	return gperr.Wrap(cfg.StartWithCerts(parent, ca, crt, key))
+	return gperr.Wrap(cfg.InitWithCerts(ctx, ca, crt, key))
 }
 
 func (cfg *AgentConfig) NewHTTPClient() *http.Client {
diff --git a/internal/config/agent_pool.go b/internal/config/agent_pool.go
index 84e9d5a..d3b7610 100644
--- a/internal/config/agent_pool.go
+++ b/internal/config/agent_pool.go
@@ -40,7 +40,7 @@ func (cfg *Config) VerifyNewAgent(host string, ca agent.PEMPair, client agent.PE
 
 	var agentCfg agent.AgentConfig
 	agentCfg.Addr = host
-	err := agentCfg.InitWithCerts(cfg.Task().Context(), ca.Cert, client.Cert, client.Key)
+	err := agentCfg.InitWithCerts(cfg.task.Context(), ca.Cert, client.Cert, client.Key)
 	if err != nil {
 		return 0, gperr.Wrap(err, "failed to start agent")
 	}
diff --git a/internal/config/config.go b/internal/config/config.go
index c73a549..5b612ec 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -280,7 +280,7 @@ func (cfg *Config) loadRouteProviders(providers *config.Providers) gperr.Error {
 	removeAllAgents()
 
 	for _, agent := range providers.Agents {
-		if err := agent.Start(cfg.task); err != nil {
+		if err := agent.Init(cfg.task.Context()); err != nil {
 			errs.Add(err.Subject(agent.String()))
 			continue
 		}