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

fix: incorrect struct tag and WaitGroup usage (#6649) 

* remove duplicated json tag

* fix: incorrect wait group usage
This commit is contained in:
rerorero 2019-10-19 02:59:29 +09:00 committed by Matt Keeler
parent 6c9a99fb3a
commit e210b0c854
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/config/config.go
View File

@ -610,7 +610,7 @@ type Performance struct {
type Telemetry struct { type Telemetry struct {
CirconusAPIApp *string `json:"circonus_api_app,omitempty" hcl:"circonus_api_app" mapstructure:"circonus_api_app"` CirconusAPIApp *string `json:"circonus_api_app,omitempty" hcl:"circonus_api_app" mapstructure:"circonus_api_app"`
CirconusAPIToken *string `json:"circonus_api_token,omitempty" json:"-" hcl:"circonus_api_token" mapstructure:"circonus_api_token" json:"-"` CirconusAPIToken *string `json:"circonus_api_token,omitempty" hcl:"circonus_api_token" mapstructure:"circonus_api_token"`
CirconusAPIURL *string `json:"circonus_api_url,omitempty" hcl:"circonus_api_url" mapstructure:"circonus_api_url"` CirconusAPIURL *string `json:"circonus_api_url,omitempty" hcl:"circonus_api_url" mapstructure:"circonus_api_url"`
CirconusBrokerID *string `json:"circonus_broker_id,omitempty" hcl:"circonus_broker_id" mapstructure:"circonus_broker_id"` CirconusBrokerID *string `json:"circonus_broker_id,omitempty" hcl:"circonus_broker_id" mapstructure:"circonus_broker_id"`
CirconusBrokerSelectTag *string `json:"circonus_broker_select_tag,omitempty" hcl:"circonus_broker_select_tag" mapstructure:"circonus_broker_select_tag"` CirconusBrokerSelectTag *string `json:"circonus_broker_select_tag,omitempty" hcl:"circonus_broker_select_tag" mapstructure:"circonus_broker_select_tag"`

6
command/debug/debug.go
View File

@ -428,9 +428,8 @@ func (c *cmd) captureDynamic() error {
s = 1 s = 1
} }
wgProf.Add(1)
go func() { go func() {
wgProf.Add(1)
prof, err := c.client.Debug().Profile(int(s)) prof, err := c.client.Debug().Profile(int(s))
if err != nil { if err != nil {
errCh <- err errCh <- err
@ -444,9 +443,8 @@ func (c *cmd) captureDynamic() error {
wgProf.Done() wgProf.Done()
}() }()
wgProf.Add(1)
go func() { go func() {
wgProf.Add(1)
trace, err := c.client.Debug().Trace(int(s)) trace, err := c.client.Debug().Trace(int(s))
if err != nil { if err != nil {
errCh <- err errCh <- err