add additional check to nginxProcesses (#483)

* add additional check to nginx processes
Co-authored-by: Donal Hurley <[email protected]>

scripts/docker/entrypoint.sh

@@ -19,6 +19,15 @@ echo "starting nginx ..."
 
 nginx_pid=$!
 
+SECONDS=0
+
+while ! ps -ef | grep "nginx: master process" | grep -v grep; do 
+    if (( SECONDS > 5 )); then 
+        echo "couldn't find nginx master process"
+        exit 1
+    fi
+done
+
 cat /etc/nginx-agent/nginx-agent.conf;
 
 # start nginx-agent, pass args

scripts/docker/official/nginx-oss-with-nginx-agent/alpine/entrypoint.sh

@@ -19,6 +19,15 @@ echo "starting nginx ..."
 
 nginx_pid=$!
 
+SECONDS=0
+
+while ! ps -ef | grep "nginx: master process" | grep -v grep; do 
+    if (( SECONDS > 5 )); then 
+        echo "couldn't find nginx master process"
+        exit 1
+    fi
+done
+
 cat /etc/nginx-agent/nginx-agent.conf;
 
 # start nginx-agent, pass args

scripts/docker/official/nginx-plus-with-nginx-agent/alpine/entrypoint.sh

@@ -19,6 +19,15 @@ echo "starting nginx ..."
 
 nginx_pid=$!
 
+SECONDS=0
+
+while ! ps -ef | grep "nginx: master process" | grep -v grep; do 
+    if (( SECONDS > 5 )); then 
+        echo "couldn't find nginx master process"
+        exit 1
+    fi
+done
+
 cat /etc/nginx-agent/nginx-agent.conf;
 
 # start nginx-agent, pass args

src/core/environment.go

@@ -605,9 +605,10 @@ func (env *EnvironmentType) Processes() (result []*Process) {
 		name, _ := p.NameWithContext(ctx)
 		cmd, _ := p.CmdlineWithContext(ctx)
 
-		if name == "nginx" && !strings.Contains(cmd, "upgrade") {
+		if env.isNginxProcess(name, cmd) {
 			nginxProcesses[pid] = p
 		}
+
 	}
 
 	for pid, nginxProcess := range nginxProcesses {
@@ -654,6 +655,10 @@ func (env *EnvironmentType) Processes() (result []*Process) {
 	return processList
 }
 
+func (env *EnvironmentType) isNginxProcess(name string, cmd string) bool {
+	return name == "nginx" && !strings.Contains(cmd, "upgrade") && strings.HasPrefix(cmd, "nginx:")
+}
+
 func getNginxProcessExe(nginxProcess *process.Process) string {
 	exe, exeErr := nginxProcess.Exe()
 	if exeErr != nil {

src/core/environment_test.go

@@ -1062,3 +1062,40 @@ func TestCGroupV1Check(t *testing.T) {
 		})
 	}
 }
+
+func TestGetNginxProcess(t *testing.T) {
+	tests := []struct {
+		name   string
+		pName  string
+		cmd    string
+		expect bool
+	}{
+		{
+			name:   "nginx process",
+			pName:  "nginx",
+			cmd:    "nginx: master process /usr/sbin/nginx -c /etc/nginx/nginx.conf",
+			expect: true,
+		},
+		{
+			name:   "non nginx process",
+			pName:  "nginx-asg-sync",
+			cmd:    "/usr/sbin/nginx-asg-sync -log_path=/var/log/nginx-asg-sync/nginx-asg-sync.log",
+			expect: false,
+		},
+		{
+			name:   "upgrade process",
+			pName:  "nginx-test",
+			cmd:    "nginx: upgrade",
+			expect: false,
+		},
+	}
+
+	for _, tt := range tests {
+		env := EnvironmentType{}
+		isNginxProcess := false
+		t.Run(tt.name, func(t *testing.T) {
+			isNginxProcess = env.isNginxProcess(tt.pName, tt.cmd)
+		})
+		assert.Equal(t, tt.expect, isNginxProcess)
+	}
+}