mirror of
https://github.com/sorenisanerd/gotty.git
synced 2024-11-09 23:34:26 +00:00
Fix option handling of close signal
This commit is contained in:
parent
56e9b89199
commit
45f8f61103
@ -2,6 +2,7 @@ package localcommand
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"syscall"
|
"syscall"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/yudai/gotty/server"
|
"github.com/yudai/gotty/server"
|
||||||
)
|
)
|
||||||
@ -15,13 +16,20 @@ type Factory struct {
|
|||||||
command string
|
command string
|
||||||
argv []string
|
argv []string
|
||||||
options *Options
|
options *Options
|
||||||
|
opts []Option
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewFactory(command string, argv []string, options *Options) (*Factory, error) {
|
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{
|
return &Factory{
|
||||||
command: command,
|
command: command,
|
||||||
argv: argv,
|
argv: argv,
|
||||||
options: options,
|
options: options,
|
||||||
|
opts: opts,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -35,10 +43,6 @@ func (factory *Factory) New(params map[string][]string) (server.Slave, error) {
|
|||||||
if params["arg"] != nil && len(params["arg"]) > 0 {
|
if params["arg"] != nil && len(params["arg"]) > 0 {
|
||||||
argv = append(argv, params["arg"]...)
|
argv = append(argv, params["arg"]...)
|
||||||
}
|
}
|
||||||
return New(
|
|
||||||
factory.command,
|
return New(factory.command, argv, factory.opts...)
|
||||||
argv,
|
|
||||||
WithCloseSignal(syscall.Signal(factory.options.CloseSignal)),
|
|
||||||
WithCloseSignal(syscall.Signal(factory.options.CloseTimeout)),
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user