Skip to content

Fix chrome process lifetime #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gitlabmike wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix chrome process lifetime #78

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions v2/gcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
"os"
"os/exec"
"sync"
"syscall"
"time"

"github.com/goccy/go-json"
Expand Down Expand Up @@ -77,6 +78,7 @@ type Gcd struct {
chromeProcess *os.Process
chromeCmd *exec.Cmd
chromeCmdOutput io.Writer
chromeProcessDone chan error
terminatedHandler TerminatedHandler
onChromeExitHandler OnChromeExitHandler
port string
Expand Down Expand Up @@ -111,6 +113,7 @@ func NewChromeDebugger(opts ...func(*Gcd)) *Gcd {
c.ctx = context.Background()
c.logger = LogDiscarder{}
c.messageObserver = observer.NewIgnoreMessagesObserver()
c.chromeProcessDone = make(chan error, 1)

for _, o := range opts {
o(c)
Expand Down Expand Up @@ -271,7 +274,7 @@ func (c *Gcd) startProcess() error {
c.processLock.Lock()
c.chromeProcess = c.chromeCmd.Process
c.processLock.Unlock()
err = c.chromeCmd.Wait()
exitErr := c.chromeCmd.Wait()

if c.onChromeExitHandler != nil {
c.onChromeExitHandler(c.profileDir, err)
Expand All @@ -286,6 +289,8 @@ func (c *Gcd) startProcess() error {
if c.terminatedHandler != nil {
c.terminatedHandler(closeMessage)
}

c.chromeProcessDone <- exitErr
}()

go func(endpoint string) {
Expand All @@ -296,12 +301,25 @@ func (c *Gcd) startProcess() error {
return err
}

// ExitProcess kills the process
// ExitProcess terminate the process and waits for exit
func (c *Gcd) ExitProcess() error {
c.processLock.Lock()
err := c.chromeProcess.Kill()
c.processLock.Unlock()
return err
defer c.processLock.Unlock()

// Try terminating nicely
c.chromeProcess.Signal(syscall.SIGTERM)

select {
case <-time.After(3 * time.Second):
// If nice doesn't work kill the process
_ = c.chromeProcess.Kill()

// Wait for process to exit
err := <-c.chromeProcessDone
return err
case err := <-c.chromeProcessDone:
return err
}
}

// PID of the started process
Expand Down