From d605f943aaa12281d2a1fb621f2dd82fb7a448df Mon Sep 17 00:00:00 2001 From: Aphral Griffin Date: Tue, 26 Sep 2023 17:06:54 +0100 Subject: [PATCH 1/2] remove error log --- src/core/nginx.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/core/nginx.go b/src/core/nginx.go index a1dda677e..04dcc944e 100644 --- a/src/core/nginx.go +++ b/src/core/nginx.go @@ -123,25 +123,15 @@ func (n *NginxBinaryType) UpdateNginxDetailsFromProcesses(nginxProcesses []*Proc n.statusUrls = map[string]string{} n.statusUrlMutex.Unlock() - numberOfMasterProcesses := 0 - for _, process := range nginxProcesses { nginxDetails := n.GetNginxDetailsFromProcess(process) if process.IsMaster { - numberOfMasterProcesses++ n.nginxDetailsMap[nginxDetails.GetNginxId()] = nginxDetails } else { n.nginxWorkersMap[nginxDetails.GetNginxId()] = append(n.nginxWorkersMap[nginxDetails.GetNginxId()], nginxDetails) } } - if len(n.nginxDetailsMap) != numberOfMasterProcesses { - log.Errorf( - "Multiple NGINX master processes detected with the same NGINX ID. Number of master processes is %d. Number of unique NGINX IDs is %d.", - numberOfMasterProcesses, - len(n.nginxDetailsMap), - ) - } } func (n *NginxBinaryType) GetChildProcesses() map[string][]*proto.NginxDetails { From e803407b7defa776654f4f291c9d65ad6c831a14 Mon Sep 17 00:00:00 2001 From: Aphral Griffin Date: Tue, 26 Sep 2023 17:09:09 +0100 Subject: [PATCH 2/2] make deps --- .../vendor/github.com/nginx/agent/v2/src/core/nginx.go | 10 ---------- .../vendor/github.com/nginx/agent/v2/src/core/nginx.go | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/test/integration/vendor/github.com/nginx/agent/v2/src/core/nginx.go b/test/integration/vendor/github.com/nginx/agent/v2/src/core/nginx.go index a1dda677e..04dcc944e 100644 --- a/test/integration/vendor/github.com/nginx/agent/v2/src/core/nginx.go +++ b/test/integration/vendor/github.com/nginx/agent/v2/src/core/nginx.go @@ -123,25 +123,15 @@ func (n *NginxBinaryType) UpdateNginxDetailsFromProcesses(nginxProcesses []*Proc n.statusUrls = map[string]string{} n.statusUrlMutex.Unlock() - numberOfMasterProcesses := 0 - for _, process := range nginxProcesses { nginxDetails := n.GetNginxDetailsFromProcess(process) if process.IsMaster { - numberOfMasterProcesses++ n.nginxDetailsMap[nginxDetails.GetNginxId()] = nginxDetails } else { n.nginxWorkersMap[nginxDetails.GetNginxId()] = append(n.nginxWorkersMap[nginxDetails.GetNginxId()], nginxDetails) } } - if len(n.nginxDetailsMap) != numberOfMasterProcesses { - log.Errorf( - "Multiple NGINX master processes detected with the same NGINX ID. Number of master processes is %d. Number of unique NGINX IDs is %d.", - numberOfMasterProcesses, - len(n.nginxDetailsMap), - ) - } } func (n *NginxBinaryType) GetChildProcesses() map[string][]*proto.NginxDetails { diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/core/nginx.go b/test/performance/vendor/github.com/nginx/agent/v2/src/core/nginx.go index a1dda677e..04dcc944e 100644 --- a/test/performance/vendor/github.com/nginx/agent/v2/src/core/nginx.go +++ b/test/performance/vendor/github.com/nginx/agent/v2/src/core/nginx.go @@ -123,25 +123,15 @@ func (n *NginxBinaryType) UpdateNginxDetailsFromProcesses(nginxProcesses []*Proc n.statusUrls = map[string]string{} n.statusUrlMutex.Unlock() - numberOfMasterProcesses := 0 - for _, process := range nginxProcesses { nginxDetails := n.GetNginxDetailsFromProcess(process) if process.IsMaster { - numberOfMasterProcesses++ n.nginxDetailsMap[nginxDetails.GetNginxId()] = nginxDetails } else { n.nginxWorkersMap[nginxDetails.GetNginxId()] = append(n.nginxWorkersMap[nginxDetails.GetNginxId()], nginxDetails) } } - if len(n.nginxDetailsMap) != numberOfMasterProcesses { - log.Errorf( - "Multiple NGINX master processes detected with the same NGINX ID. Number of master processes is %d. Number of unique NGINX IDs is %d.", - numberOfMasterProcesses, - len(n.nginxDetailsMap), - ) - } } func (n *NginxBinaryType) GetChildProcesses() map[string][]*proto.NginxDetails {