Skip to content

Commit e2d123f

Browse files
authored
Merge pull request #2574 from nirs/background-fix
Run in a new process group when not using --foreground
2 parents 726f61d + 47a3d7b commit e2d123f

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

pkg/instance/ha_cmd_opts_others.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,7 @@ import (
66
"syscall"
77
)
88

9-
var SysProcAttr = &syscall.SysProcAttr{}
9+
var (
10+
ForegroundSysProcAttr = &syscall.SysProcAttr{}
11+
BackgroundSysProcAttr = &syscall.SysProcAttr{Setpgid: true}
12+
)

pkg/instance/ha_cmd_opts_windows.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ import (
44
"syscall"
55
)
66

7-
var SysProcAttr = &syscall.SysProcAttr{
8-
CreationFlags: syscall.CREATE_NEW_PROCESS_GROUP,
9-
}
7+
var (
8+
ForegroundSysProcAttr = &syscall.SysProcAttr{}
9+
BackgroundSysProcAttr = &syscall.SysProcAttr{
10+
CreationFlags: syscall.CREATE_NEW_PROCESS_GROUP,
11+
}
12+
)

pkg/instance/start.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,12 @@ func Start(ctx context.Context, inst *store.Instance, launchHostAgentForeground
189189
}
190190
args = append(args, inst.Name)
191191
haCmd := exec.CommandContext(ctx, self, args...)
192-
haCmd.SysProcAttr = SysProcAttr
192+
193+
if launchHostAgentForeground {
194+
haCmd.SysProcAttr = ForegroundSysProcAttr
195+
} else {
196+
haCmd.SysProcAttr = BackgroundSysProcAttr
197+
}
193198

194199
haCmd.Stdout = haStdoutW
195200
haCmd.Stderr = haStderrW

0 commit comments

Comments
 (0)