maride/gotty
1
0
Fork 0
mirror of https://github.com/sorenisanerd/gotty.git synced 2024-12-22 15:17:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix option handling of close signal

Browse Source
This commit is contained in:
Iwasaki Yudai 2017-08-20 13:39:06 +09:00
parent 56e9b89199
commit 45f8f61103
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backend/localcommand/factory.go
View File

@ -2,6 +2,7 @@ package localcommand
import (
"syscall"
"time"
"github.com/yudai/gotty/server"
)
@ -15,13 +16,20 @@ type Factory struct {
command string
argv []string
options *Options
opts []Option
}
func NewFactory(command string, argv []string, options *Options) (*Factory, error) {
opts := []Option{WithCloseSignal(syscall.Signal(options.CloseSignal))}
if options.CloseTimeout >= 0 {
opts = append(opts, WithCloseTimeout(time.Duration(options.CloseTimeout)*time.Second))
}
return &Factory{
command: command,
argv: argv,
options: options,
opts: opts,
}, nil
}
@ -35,10 +43,6 @@ func (factory *Factory) New(params map[string][]string) (server.Slave, error) {
if params["arg"] != nil && len(params["arg"]) > 0 {
argv = append(argv, params["arg"]...)
}
return New(
factory.command,
argv,
WithCloseSignal(syscall.Signal(factory.options.CloseSignal)),
WithCloseSignal(syscall.Signal(factory.options.CloseTimeout)),
)
return New(factory.command, argv, factory.opts...)
}