mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-10 21:53:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

move notifySocket out of signalHandler

Browse Source 
In fact, notifySocket has no relationship to signalHandler, we
can move it out of signalHandler to make the code more clear.

Signed-off-by: lifubang <lifubang@acmcoder.com>
This commit is contained in:
lifubang
2025-03-18 14:25:02 +00:00
committed by Kir Kolyshkin
parent fba5a1ec23
commit e259ae0c38
3 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils_linux.go
+6 -1
View File
@@ -258,7 +258,7 @@ func (r *runner) run(config *specs.Process) (_ int, retErr error) {
// Setting up IO is a two stage process. We need to modify process to deal
// with detaching containers, and then we get a tty after the container has
// started.
handlerCh := newSignalHandler(r.enableSubreaper, r.notifySocket)
handlerCh := newSignalHandler(r.enableSubreaper)
tty, err := setupIO(process, r.container, config.Terminal, detach, r.consoleSocket)
if err != nil {
return -1, err
@@ -301,6 +301,11 @@ func (r *runner) run(config *specs.Process) (_ int, retErr error) {
return -1, err
}
}
if r.notifySocket != nil {
if err = r.notifySocket.forward(process, detach); err != nil {
return -1, err
}
}
handler := <-handlerCh
status, err := handler.forward(process, tty, detach)
if detach {