traeak commented on a change in pull request #2931: reuse single riak cluster
connection, up riak heartbeat timeout
URL: https://github.com/apache/trafficcontrol/pull/2931#discussion_r230912579
##########
File path: traffic_ops/traffic_ops_golang/riaksvc/riak_services.go
##########
@@ -73,18 +84,42 @@ func (ri RiakStorageCluster) Execute(command riak.Command)
error {
}
func GetRiakConfig(riakConfigFile string) (bool, *riak.AuthOptions, error) {
- riakConfBytes, err := ioutil.ReadFile(riakConfigFile)
+ riakConfString, err := ioutil.ReadFile(riakConfigFile)
if err != nil {
return false, nil, fmt.Errorf("reading riak conf '%v': %v",
riakConfigFile, err)
}
+ riakConfBytes := []byte(riakConfString)
+
rconf := &riak.AuthOptions{}
rconf.TlsConfig = &tls.Config{}
- err = json.Unmarshal([]byte(riakConfBytes), &rconf)
+ err = json.Unmarshal(riakConfBytes, &rconf)
if err != nil {
- return false, nil, fmt.Errorf("Unmarshalling riak conf '%v':
%v", riakConfigFile, err)
+ return false, nil, fmt.Errorf("Unmarshaling riak conf '%v':
%v", riakConfigFile, err)
+ }
+
+ type config struct {
+ Hci string `json:"HealthCheckInterval"`
+ }
+
+ var checkconfig config
+ err = json.Unmarshal(riakConfBytes, &checkconfig)
+ if err == nil {
+ hci, _ := time.ParseDuration(checkconfig.Hci)
+ if 0 < hci {
Review comment:
fairly minor
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
