diff --git a/agent/handler/httphandler.go b/agent/handler/httphandler.go index e4af631c6a52bf74839940407af8c5d6bc7166f1..85c183bc96fa3f92ab356d1e96b85a7b6a4154f0 100755 --- a/agent/handler/httphandler.go +++ b/agent/handler/httphandler.go @@ -17,8 +17,8 @@ import ( func RawMetricDataHandle(ctx *gin.Context) { // 验证topo server请求来源 if ctx.RemoteIP() != strings.Split(conf.Config().Topo.Server_addr, ":")[0] { - err := errors.Errorf("unknow topo server: %s", ctx.RemoteIP()) - logger.ErrorStack("", err) + err := errors.Errorf("unknow client request from %s: %s", ctx.RemoteIP(), ctx.Request.URL) + logger.Error(err.Error()) // errors.EORE(err) ctx.JSON(http.StatusBadRequest, gin.H{ "code": -1, @@ -51,8 +51,8 @@ func RawMetricDataHandle(ctx *gin.Context) { func HealthCheckHandle(ctx *gin.Context) { // 验证topo server请求来源 if ctx.RemoteIP() != strings.Split(conf.Config().Topo.Server_addr, ":")[0] { - err := errors.Errorf("unknow topo server: %s", ctx.RemoteIP()) - logger.ErrorStack("", err) + err := errors.Errorf("unknow client request from %s: %s", ctx.RemoteIP(), ctx.Request.URL) + logger.Error(err.Error()) // errors.EORE(err) ctx.JSON(http.StatusBadRequest, gin.H{ "code": -1, @@ -74,8 +74,8 @@ func HealthCheckHandle(ctx *gin.Context) { func ContainerListHandle(ctx *gin.Context) { // 验证topo server请求来源 if ctx.RemoteIP() != strings.Split(conf.Config().Topo.Server_addr, ":")[0] { - err := errors.Errorf("unknow topo server: %s", ctx.RemoteIP()) - logger.ErrorStack("", err) + err := errors.Errorf("unknow client request from %s: %s", ctx.RemoteIP(), ctx.Request.URL) + logger.Error(err.Error()) // errors.EORE(err) ctx.JSON(http.StatusBadRequest, gin.H{ "code": -1, @@ -93,4 +93,4 @@ func ContainerListHandle(ctx *gin.Context) { } response.Success(ctx, containers, "success") -} \ No newline at end of file +} diff --git a/server/db/redismanager/redis.go b/server/db/redismanager/redis.go index 2b6e9dec659f29da5afab92518b933abff541965..e8f62c0e7b262050084a3362feb3df586c935774 100644 --- a/server/db/redismanager/redis.go +++ b/server/db/redismanager/redis.go @@ -5,7 +5,6 @@ import ( "crypto/tls" "encoding/json" "fmt" - "strings" "sync" "sync/atomic" "time" @@ -220,11 +219,11 @@ func (r *RedisClient) UpdateTopoRunningAgentList(uuids []string, updateonce bool }) if len(abort_reason) != 0 { - logger.Debug("%sagent status%s", strings.Repeat("=", 9), strings.Repeat("=", 9)) + logger.Debug("========agent status========") for _, r := range abort_reason { logger.Debug(r) } - logger.Debug(strings.Repeat("=", 30)) + logger.Debug("============================") } if updateonce { diff --git a/server/generator/generator.go b/server/generator/generator.go index 3964e9a73745d6885da3ec50f7b9341e9ab22b55..396b11a2ef5e326b58ca679abb2a0b6bd92aea2f 100755 --- a/server/generator/generator.go +++ b/server/generator/generator.go @@ -149,7 +149,7 @@ func (t *TopoGenerator) collectInstantData() []error { go func() { defer wg.Done() - // ttcode + temp_start := time.Now() agent := value.(*agentmanager.Agent) agent.Port = conf.Global_Config.Topo.Agent_port @@ -160,7 +160,7 @@ func (t *TopoGenerator) collectInstantData() []error { errorlist_rwlock.Unlock() } agentmanager.Global_AgentManager.AddAgent_T(agent) - // ttcode + temp_elapse := time.Since(temp_start) logger.Info("\033[32mtopo server 采集数据获取时间\033[0m: %s, %v, total\n", agent.UUID, temp_elapse) }()