luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

simpler fix

This commit is contained in:
Hans Hasselberg 2019-01-24 17:12:08 +01:00
parent 944268c6a4
commit fa2d8f4568
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
agent/structs/structs.go
View File

@ -917,26 +917,27 @@ type HealthCheckDefinition struct {
DeregisterCriticalServiceAfter time.Duration `json:",omitempty"`
}
type Alias HealthCheckDefinition
type exportedHealthCheckDefinition struct {
Interval string `json:",omitempty"`
Timeout string `json:",omitempty"`
DeregisterCriticalServiceAfter string `json:",omitempty"`
*Alias
}
func (d *HealthCheckDefinition) MarshalJSON() ([]byte, error) {
exported := &exportedHealthCheckDefinition{
Alias: (*Alias)(d),
type Alias HealthCheckDefinition
exported := &struct {
Interval string `json:",omitempty"`
Timeout string `json:",omitempty"`
DeregisterCriticalServiceAfter string `json:",omitempty"`
*Alias
}{
Interval: d.Interval.String(),
Timeout: d.Timeout.String(),
DeregisterCriticalServiceAfter: d.DeregisterCriticalServiceAfter.String(),
Alias: (*Alias)(d),
}
if d.Interval != 0 {
exported.Interval = d.Interval.String()
if d.Interval == 0 {
exported.Interval = ""
}
if d.Timeout != 0 {
exported.Timeout = d.Interval.String()
if d.Timeout == 0 {
exported.Timeout = ""
}
if d.DeregisterCriticalServiceAfter != 0 {
exported.DeregisterCriticalServiceAfter = d.Interval.String()
if d.DeregisterCriticalServiceAfter == 0 {
exported.DeregisterCriticalServiceAfter = ""
}
return json.Marshal(exported)