extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-01-03 04:48:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

config: update yaml-config and use zeropositive constraint for timeouts

Browse Source
This commit is contained in:
Christian Schwarz 2018-12-11 21:54:36 +01:00
parent ef3283638a
commit c1aab0bee9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gopkg.lock generated
View File

@ -281,11 +281,11 @@
[[projects]] [[projects]]
branch = "v2" branch = "v2"
digest = "1:9d92186f609a73744232323416ddafd56fae67cb552162cc190ab903e36900dd" digest = "1:6b8a6afafde7ed31cd0c577ba40d88ce39e8f1c5eb76d7836be7d5b74f1c534a"
name = "github.com/zrepl/yaml-config" name = "github.com/zrepl/yaml-config"
packages = ["."] packages = ["."]
pruneopts = "" pruneopts = ""
revision = "af27d27978ad95808723a62d87557d63c3ff0605" revision = "08227ad854131f7dfcdfb12579fb73dd8a38a03a"
[[projects]] [[projects]]
branch = "master" branch = "master"

8
config/config.go
View File

@ -167,7 +167,7 @@ type ConnectCommon struct {
type TCPConnect struct { type TCPConnect struct {
ConnectCommon `yaml:",inline"` ConnectCommon `yaml:",inline"`
Address string `yaml:"address"` Address string `yaml:"address"`
DialTimeout time.Duration `yaml:"dial_timeout,positive,default=10s"` DialTimeout time.Duration `yaml:"dial_timeout,zeropositive,default=10s"`
} }
type TLSConnect struct { type TLSConnect struct {
@ -177,7 +177,7 @@ type TLSConnect struct {
Cert string `yaml:"cert"` Cert string `yaml:"cert"`
Key string `yaml:"key"` Key string `yaml:"key"`
ServerCN string `yaml:"server_cn"` ServerCN string `yaml:"server_cn"`
DialTimeout time.Duration `yaml:"dial_timeout,positive,default=10s"` DialTimeout time.Duration `yaml:"dial_timeout,zeropositive,default=10s"`
} }
type SSHStdinserverConnect struct { type SSHStdinserverConnect struct {
@ -189,7 +189,7 @@ type SSHStdinserverConnect struct {
TransportOpenCommand []string `yaml:"transport_open_command,optional"` //TODO unused TransportOpenCommand []string `yaml:"transport_open_command,optional"` //TODO unused
SSHCommand string `yaml:"ssh_command,optional"` //TODO unused SSHCommand string `yaml:"ssh_command,optional"` //TODO unused
Options []string `yaml:"options,optional"` Options []string `yaml:"options,optional"`
DialTimeout time.Duration `yaml:"dial_timeout,positive,default=10s"` DialTimeout time.Duration `yaml:"dial_timeout,zeropositive,default=10s"`
} }
type LocalConnect struct { type LocalConnect struct {
@ -220,7 +220,7 @@ type TLSServe struct {
Cert string `yaml:"cert"` Cert string `yaml:"cert"`
Key string `yaml:"key"` Key string `yaml:"key"`
ClientCNs []string `yaml:"client_cns"` ClientCNs []string `yaml:"client_cns"`
HandshakeTimeout time.Duration `yaml:"handshake_timeout,positive,default=10s"` HandshakeTimeout time.Duration `yaml:"handshake_timeout,zeropositive,default=10s"`
} }
type StdinserverServer struct { type StdinserverServer struct {