PR feedback

Author: aphralG

src/core/environment.go

@@ -656,12 +656,7 @@ func (env *EnvironmentType) Processes() (result []*Process) {
 }
 
 func (env *EnvironmentType) isNginxProcess(name string, cmd string) bool {
-	base := filepath.Base(name) // strip path if any
-
-	// Accept both the normal nginx binary and the debug binary
-	isNginxBinary := base == "nginx" || base == "nginx-debug"
-
-	return isNginxBinary && !strings.Contains(cmd, "upgrade") && strings.HasPrefix(cmd, "nginx:")
+	return !strings.Contains(cmd, "upgrade") && (strings.HasPrefix(cmd, "nginx:") || strings.HasPrefix(cmd, "{nginx-debug} nginx:"))
 }
 
 func getNginxProcessExe(nginxProcess *process.Process) string {

src/core/environment_test.go

@@ -1146,29 +1146,11 @@ func TestGetNginxProcess(t *testing.T) {
 			expect: false,
 		},
 		{
-			name:   "nginx binary with master cmd",
-			pName:  "nginx",
-			cmd:    "nginx: master process /usr/sbin/nginx -c /etc/nginx/nginx.conf",
-			expect: true,
-		},
-		{
-			name:   "nginx-debug binary with master cmd",
+			name:   "nginx-debug process",
 			pName:  "nginx-debug",
-			cmd:    "nginx: master process /usr/sbin/nginx-debug -c /etc/nginx/nginx.conf",
+			cmd:    "{nginx-debug} nginx: master process /usr/sbin/nginx-debug -g daemon off;",
 			expect: true,
 		},
-		{
-			name:   "nginx-asg-sync shouldn't match",
-			pName:  "nginx-asg-sync",
-			cmd:    "/usr/sbin/nginx-asg-sync -log_path=/var/log/...",
-			expect: false,
-		},
-		{
-			name:   "nginx upgrade excluded",
-			pName:  "nginx",
-			cmd:    "nginx: upgrade",
-			expect: false,
-		},
 	}
 
 	for _, tt := range tests {