Improve env marker and code conventions

sreya · sreya · commit 85d0635f469f · 2022-06-16T22:03:13.000Z
diff --git a/agent/reaper/reaper.go b/agent/reaper/reaper.go
@@ -13,7 +13,7 @@ import (
 // to indicated that the process is a child as opposed to the reaper.
 // Since we are forkexec'ing we need to be able to differentiate between
 // the two to avoid fork bombing ourselves.
-const agentEnvMark = "CODER_REAPER_AGENT"
+const agentEnvMark = "CODER_DO_NOT_REAP"
 
 // IsChild returns true if we're the forked process.
 func IsChild() bool {
@@ -34,41 +34,43 @@ func IsInitProcess() bool {
 func ForkReap(pids reap.PidCh) error {
 	// Check if the process is the parent or the child.
 	// If it's the child we want to skip attempting to reap.
-	if !IsChild() {
-		go reap.ReapChildren(pids, nil, nil, nil)
+	if IsChild() {
+		return nil
+	}
+
+	go reap.ReapChildren(pids, nil, nil, nil)
 
-		args := os.Args
-		// This is simply done to help identify the real agent process
-		// when viewing in something like 'ps'.
-		args = append(args, "#Agent")
+	args := os.Args
+	// This is simply done to help identify the real agent process
+	// when viewing in something like 'ps'.
+	args = append(args, "#Agent")
 
-		pwd, err := os.Getwd()
-		if err != nil {
-			return xerrors.Errorf("get wd: %w", err)
-		}
+	pwd, err := os.Getwd()
+	if err != nil {
+		return xerrors.Errorf("get wd: %w", err)
+	}
 
-		pattrs := &syscall.ProcAttr{
-			Dir: pwd,
-			// Add our marker for identifying the child process.
-			Env: append(os.Environ(), fmt.Sprintf("%s=true", agentEnvMark)),
-			Sys: &syscall.SysProcAttr{
-				Setsid: true,
-			},
-			Files: []uintptr{
-				uintptr(syscall.Stdin),
-				uintptr(syscall.Stdout),
-				uintptr(syscall.Stderr),
-			},
-		}
+	pattrs := &syscall.ProcAttr{
+		Dir: pwd,
+		// Add our marker for identifying the child process.
+		Env: append(os.Environ(), fmt.Sprintf("%s=true", agentEnvMark)),
+		Sys: &syscall.SysProcAttr{
+			Setsid: true,
+		},
+		Files: []uintptr{
+			uintptr(syscall.Stdin),
+			uintptr(syscall.Stdout),
+			uintptr(syscall.Stderr),
+		},
+	}
 
-		pid, _ := syscall.ForkExec(args[0], args, pattrs)
+	//#nosec G204
+	pid, _ := syscall.ForkExec(args[0], args, pattrs)
 
-		var wstatus syscall.WaitStatus
+	var wstatus syscall.WaitStatus
+	_, err = syscall.Wait4(pid, &wstatus, 0, nil)
+	for xerrors.Is(err, syscall.EINTR) {
 		_, err = syscall.Wait4(pid, &wstatus, 0, nil)
-		for xerrors.Is(err, syscall.EINTR) {
-			_, err = syscall.Wait4(pid, &wstatus, 0, nil)
-		}
-		return nil
 	}
 
 	return nil
