X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=internal%2Fsdlgoredis%2Fsdlgoredis.go;h=4121bb9abe50ab371f8e3f7c6975ee70d2a20723;hb=bd724d66fdfee6b1a6e589a4081529dd535ca423;hp=8cdae4638b3d9c6621bd90bbfcce4eb68fe8286f;hpb=d14c9d8bc5ed846c4b9f05af739eb9fba1978737;p=ric-plt%2Fsdlgo.git diff --git a/internal/sdlgoredis/sdlgoredis.go b/internal/sdlgoredis/sdlgoredis.go index 8cdae46..4121bb9 100644 --- a/internal/sdlgoredis/sdlgoredis.go +++ b/internal/sdlgoredis/sdlgoredis.go @@ -850,14 +850,21 @@ func (db *DB) fillDbStateFromDbInfo(info *DbInfo) (*DbState, error) { 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) { + var err error 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 { @@ -884,9 +891,14 @@ func sentinelStatistics(db *DB) (*DbStatistics, error) { 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()) - replicaDb.CloseDB() + if closeErr := replicaDb.CloseDB(); closeErr != nil { + return nil, closeErr + } if err != nil { return nil, err }