luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Fix error parsing config when setting consul.timeout. (#6907)

Browse source 
When parsing a config file which had the consul.timeout param set,
Nomad was reporting an error causing startup to fail. This seems
to be caused by the HCL decoder interpreting the timeout type as
an int rather than a string. This is caused by the struct
TimeoutHCL param having a hcl key of timeout alongside a Timeout
struct param of type time.Duration (int). Ensuring the decoder
ignores the Timeout struct param ensure the decoder runs
correctly.
This commit is contained in:
James Rasell 2020-01-07 19:40:55 +01:00 committed by Tim Gross
parent 56401fabf3
commit df2dc48790
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nomad/structs/config/consul.go
View file

@ -65,8 +65,8 @@ type ConsulConfig struct {
GRPCAddr string `hcl:"grpc_address"` GRPCAddr string `hcl:"grpc_address"`
// Timeout is used by Consul HTTP Client // Timeout is used by Consul HTTP Client
Timeout time.Duration Timeout time.Duration `hcl:"-"`
TimeoutHCL string `hcl:"timeout" json:"-"` TimeoutHCL string `hcl:"timeout" json:"-"`
// Token is used to provide a per-request ACL token. This options overrides // Token is used to provide a per-request ACL token. This options overrides
// the agent's default token // the agent's default token