Преглед изворни кода

entirely get rid of legacy stuff

backfeed-full-error
Fusl пре 1 година
родитељ
комит
f08b65b4d4
1 измењених фајлова са 6 додато и 21 уклоњено
  1. +6
    -21
      main.go

+ 6
- 21
main.go Прегледај датотеку

@@ -153,14 +153,14 @@ func (that *ProjectBackfeedManager) Do() {
now := time.Now() now := time.Now()
resultMap := map[string]*redis.Cmd{} resultMap := map[string]*redis.Cmd{}
pipe := that.BackfeedRedis.Pipeline() pipe := that.BackfeedRedis.Pipeline()
lastTS := make([]interface{}, 0, len(keyMap)*2)
lastTS := make([]any, 0, len(keyMap)*2)
for key := range keyMap { for key := range keyMap {
lastTS = append(lastTS, key) lastTS = append(lastTS, key)
lastTS = append(lastTS, fmt.Sprintf("%d", now.Unix())) lastTS = append(lastTS, fmt.Sprintf("%d", now.Unix()))
} }
pipe.HSet(context.Background(), ":last_ts", lastTS...) pipe.HSet(context.Background(), ":last_ts", lastTS...)
for key, items := range keyMap { for key, items := range keyMap {
args := []interface{}{
args := []any{
"bf.madd", "bf.madd",
key, key,
} }
@@ -172,7 +172,7 @@ func (that *ProjectBackfeedManager) Do() {
if _, err := pipe.Exec(context.Background()); err != nil { if _, err := pipe.Exec(context.Background()); err != nil {
log.Printf("%s", err) log.Printf("%s", err)
} }
var sAddItems []interface{}
var sAddItems []any
for key, items := range keyMap { for key, items := range keyMap {
res, err := resultMap[key].BoolSlice() res, err := resultMap[key].BoolSlice()
if err != nil { if err != nil {
@@ -350,19 +350,19 @@ func GenShardHash(b []byte) (final byte) {
return final return final
} }


func WriteResponse(res http.ResponseWriter, statusCode int, v interface{}) {
func WriteResponse(res http.ResponseWriter, statusCode int, v any) {
res.Header().Set("Content-Type", "application/json") res.Header().Set("Content-Type", "application/json")
res.WriteHeader(statusCode) res.WriteHeader(statusCode)
if statusCode == http.StatusNoContent { if statusCode == http.StatusNoContent {
return return
} }
if err, isError := v.(error); isError { if err, isError := v.(error); isError {
v = map[string]interface{}{
v = map[string]any{
"error": fmt.Sprintf("%v", err), "error": fmt.Sprintf("%v", err),
"status_code": statusCode, "status_code": statusCode,
} }
} else { } else {
v = map[string]interface{}{
v = map[string]any{
"data": v, "data": v,
"status_code": statusCode, "status_code": statusCode,
} }
@@ -474,14 +474,6 @@ func main() {
trackerRedisOptions.ReadTimeout = 15 * time.Minute trackerRedisOptions.ReadTimeout = 15 * time.Minute
trackerRedisClient := redis.NewClient(trackerRedisOptions) trackerRedisClient := redis.NewClient(trackerRedisOptions)


legacyRedisOptions, err := redis.ParseURL(os.Getenv("REDIS_LEGACY"))
if err != nil {
log.Panicf("invalid REDIS_LEGACY url: %s", err)
}
legacyRedisOptions.ReadTimeout = 15 * time.Minute
legacyRedisOptions.PoolSize = 128
legacyRedisClient := redis.NewClient(legacyRedisOptions)

backfeedRedisClient := redis.NewClusterClient(&redis.ClusterOptions{ backfeedRedisClient := redis.NewClusterClient(&redis.ClusterOptions{
Addrs: strings.Split(os.Getenv("REDIS_BACKFEED_ADDRS"), ","), Addrs: strings.Split(os.Getenv("REDIS_BACKFEED_ADDRS"), ","),
Username: os.Getenv("REDIS_BACKFEED_USERNAME"), Username: os.Getenv("REDIS_BACKFEED_USERNAME"),
@@ -490,10 +482,6 @@ func main() {
PoolSize: 256, PoolSize: 256,
}) })


legacyRedisMetricsHook := redisprom.NewHook(
redisprom.WithInstanceName("legacy"),
)
legacyRedisClient.AddHook(legacyRedisMetricsHook)
backfeedRedisMetricsHook := redisprom.NewHook( backfeedRedisMetricsHook := redisprom.NewHook(
redisprom.WithInstanceName("backfeed"), redisprom.WithInstanceName("backfeed"),
) )
@@ -513,9 +501,6 @@ func main() {
client.ClientGetName(ctx) client.ClientGetName(ctx)
return client.Ping(ctx).Err() return client.Ping(ctx).Err()
}) })
if err := legacyRedisClient.Ping(context.Background()).Err(); err != nil {
log.Panicf("unable to ping legacy redis: %s", err)
}


globalBackfeedManager := &GlobalBackfeedManager{ globalBackfeedManager := &GlobalBackfeedManager{
ActiveFeeds: map[string]*ProjectBackfeedManager{}, ActiveFeeds: map[string]*ProjectBackfeedManager{},


Loading…
Откажи
Сачувај