eosswedenorg/thalos
1
0
Fork 0
mirror of https://github.com/eosswedenorg/thalos synced 2026-06-20 09:56:47 +02:00
Code Releases Activity

Refactor to use the new redis.Key,redis.Namespace and redis.Channel types.

Browse source
This commit is contained in:
Henrik Hautakoski 2023-01-06 17:06:27 +01:00
parent 61beca435c
commit 13c8ed7692
3 changed files with 18 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ship_processor.go
View file

@ -21,18 +21,18 @@ func encodeMessage(v interface{}) ([]byte, bool) {
return payload, true
}
func queueMessage(channel string, payload []byte) bool {
err := redis.RegisterPublish(channel, payload).Err()
func queueMessage(key redis.Key, payload []byte) bool {
err := redis.RegisterPublish(key.String(), payload).Err()
if err != nil {
log.WithError(err).Errorf("Failed to post to channel '%s'", channel)
log.WithError(err).Errorf("Failed to post to channel '%s'", key)
return false
}
return true
}
func encodeQueue(key string, v interface{}) bool {
func encodeQueue(channel redis.Channel, v interface{}) bool {
if payload, ok := encodeMessage(v); ok {
channel := redis.Key(key)
channel := redis.Key{NS: redisNs, Channel: channel}
if queueMessage(channel, payload) {
return true
}
@ -52,7 +52,7 @@ func processBlock(block *ship.GetBlocksResultV0) {
HeadBlockNum: block.Head.BlockNum,
}
encodeQueue("heartbeat", hb)
encodeQueue(redis.HeartbeatChannel, hb)
_, err := redis.Send()
if err != nil {
@ -64,7 +64,7 @@ func processBlock(block *ship.GetBlocksResultV0) {
func processTraces(traces []*ship.TransactionTraceV0) {
for _, trace := range traces {
encodeQueue("transactions", trace)
encodeQueue(redis.TransactionChannel, trace)
// Actions
for _, actionTraceVar := range trace.ActionTraces {
@ -94,11 +94,11 @@ func processTraces(traces []*ship.TransactionTraceV0) {
continue
}
channels := []string{
redis.Key("actions"),
redis.Key("actions", "action:"+string(act.Action)),
redis.Key("actions", "contract:"+string(act.Contract)),
redis.Key("actions", "contract:"+string(act.Contract), "action:"+string(act.Action)),
channels := []redis.Key{
{NS: redisNs, Channel: redis.ActionChannel{}},
{NS: redisNs, Channel: redis.ActionChannel{Action: string(act.Action)}},
{NS: redisNs, Channel: redis.ActionChannel{Contract: string(act.Contract)}},
{NS: redisNs, Channel: redis.ActionChannel{Action: string(act.Action), Contract: string(act.Contract)}},
}
for _, channel := range channels {