github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Implement review comments

Browse Source
This commit is contained in:
Patrick Pacher
2020-07-17 11:07:46 +02:00
parent 7690793c66
commit 6d69039c20
6 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmds/portmaster-start/run.go
View File

@@ -100,7 +100,7 @@ func getExecArgs(opts *Options, cmdArgs []string) []string {
args := []string{"--data", dataDir}
if stdinSignals {
args = append(args, "-input-signals")
args = append(args, "--input-signals")
}
args = append(args, cmdArgs...)
return args
@@ -110,7 +110,7 @@ func run(opts *Options, cmdArgs []string) (err error) {
// set download option
registry.Online = opts.AllowDownload
if isShutdown() {
if isShuttingDown() {
return nil
}
@@ -328,8 +328,7 @@ func execute(opts *Options, args []string) (cont bool, err error) {
// wait until shut down
select {
case <-finished:
case <-time.After(11 * time.Second): // portmaster core prints stack if not able to shutdown in 10 seconds
// kill
case <-time.After(3 * time.Minute): // portmaster core prints stack if not able to shutdown in 3 minutes, give it one more ...
err = exc.Process.Kill()
if err != nil {
return false, fmt.Errorf("failed to kill %s: %s", opts.Identifier, err)