Add handling of net.SplitHostPort() function error return value.
Issue-Id: RIC-942
Signed-off-by: Timo Tietavainen <timo.tietavainen@nokia.com>
Change-Id: Ief30f269fe67451144652ba740bb72f3e962799f
return &dbState, dbState.Err
}
return &dbState, dbState.Err
}
-func createReplicaDbClient(host string) *DB {
- addr, port, _ := net.SplitHostPort(host)
- return createDbClient(addr, port, "", "", "", newRedisClient, subscribeNotifications, nil)
+func createReplicaDbClient(host string) (*DB, error) {
+ addr, port, err := net.SplitHostPort(host)
+ if err != nil {
+ return nil, err
+ }
+ return createDbClient(addr, port, "", "", "", newRedisClient, subscribeNotifications, nil), err
}
func getStatisticsInfo(db *DB, host string) (*DbStatisticsInfo, error) {
}
func getStatisticsInfo(db *DB, host string) (*DbStatisticsInfo, error) {
dbStatisticsInfo := new(DbStatisticsInfo)
dbStatisticsInfo := new(DbStatisticsInfo)
- dbStatisticsInfo.IPAddr, dbStatisticsInfo.Port, _ = net.SplitHostPort(host)
+ dbStatisticsInfo.IPAddr, dbStatisticsInfo.Port, err = net.SplitHostPort(host)
+ if err != nil {
+ return nil, err
+ }
info, err := db.Info()
if err != nil {
info, err := db.Info()
if err != nil {
if dbState.ReplicasDbState != nil {
for _, r := range dbState.ReplicasDbState.States {
if dbState.ReplicasDbState != nil {
for _, r := range dbState.ReplicasDbState.States {
- replicaDb := createReplicaDbClient(r.GetAddress())
+ replicaDb, err := createReplicaDbClient(r.GetAddress())
+ if err != nil {
+ return nil, err
+ }
dbStatisticsInfo, err = getStatisticsInfo(replicaDb, r.GetAddress())
if closeErr := replicaDb.CloseDB(); closeErr != nil {
return nil, closeErr
dbStatisticsInfo, err = getStatisticsInfo(replicaDb, r.GetAddress())
if closeErr := replicaDb.CloseDB(); closeErr != nil {
return nil, closeErr