Skip to content

reduce redis connections #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JssDWt wants to merge 4 commits into
base: main
Choose a base branch
from
Open

reduce redis connections #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b95481
remove unused redis connection
JssDWt Jan 16, 2025
77ea577
remove overlapping redis connection
JssDWt Jan 16, 2025
e232805
remove redundant redis connection
JssDWt Jan 16, 2025
a635313
don't hold redis connection during firebase request
JssDWt Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions removefunds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ func ensureOnChainPaymentSent(payReqHash string) (string, error) {
}

func sendCoinsForReceivedPayment(payReqHash string) (string, error) {
redisConn := redisPool.Get()
defer redisConn.Close()

removeFundRequest, err := getKeyFields(payReqHash)
if err != nil {
log.Printf("error querying payment request hash, %v", err)
Expand Down
89 changes: 55 additions & 34 deletions transactions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,20 +160,29 @@ func handleTransaction(tx *lnrpc.Transaction) error {
}

func registerTransacionConfirmation(txID, token, notifyType string) error {
registrationKey, err := doRegisterTransacionConfirmation(txID, token, notifyType)
if err != nil {
return err
}
err = setKeyExpiration(registrationKey, transactionNotificationExpiry)
return err
}

func doRegisterTransacionConfirmation(txID, token, notifyType string) (string, error) {
redisConn := redisPool.Get()
defer redisConn.Close()
registrationKey := fmt.Sprintf("tx-notify-%v", txID)
registrationData := map[string]string{"token": token, "type": notifyType}
marshalled, err := json.Marshal(registrationData)
if err != nil {
return err
return "", err
}
_, err = redisConn.Do("SADD", registrationKey, string(marshalled))
if err != nil {
return err
return "", err
}
err = setKeyExpiration(registrationKey, transactionNotificationExpiry)
return err

return registrationKey, nil
}

func handleTransactionNotifications(tx *lnrpc.Transaction) error {
Expand Down Expand Up @@ -229,15 +238,13 @@ func handleTransactionAddreses(tx *lnrpc.Transaction) error {
}
if n > 0 {
if tx.NumConfirmations > 0 {
err = handleTransactionAddress(tx, i)
err = handleTransactionAddress(tx, i, redisConn)
if err != nil {
return err
}
go notifyClientTransaction(tx, i, "Action Required", "Breez", "Received funds are now confirmed. Please open the app to complete your transaction.", true)
break // There is only one address concerning us per transaction
} else {
redisConn := redisPool.Get()
defer redisConn.Close()
_, err := redisConn.Do("HMSET", "input-address:"+tx.DestAddresses[i],
"utx:TxHash", tx.TxHash,
"utx:Amount", tx.Amount,
Expand All @@ -258,50 +265,64 @@ func handleTransactionAddreses(tx *lnrpc.Transaction) error {
func notifyClientTransaction(tx *lnrpc.Transaction, index int, msg, title, body string, delete bool) {
key := tx.TxHash + "-notification"
_, _, _ = txNotificationGroup.Do(key, func() (interface{}, error) {
redisConn := redisPool.Get()
defer redisConn.Close()
tokens, err := redis.Strings(redisConn.Do("SMEMBERS", "input-address-notification:"+tx.DestAddresses[index]))
tokens, data, err := getTxNotificationData(tx, index, msg)
if err != nil {
log.Println("notifyUnconfirmed error:", err)
return nil, nil
}
data := map[string]string{
"msg": msg,
"tx": tx.TxHash,
"address": tx.DestAddresses[index],
"value": strconv.FormatInt(tx.Amount, 10),
}

for _, tok := range tokens {
err = notifyAlertMessage(title, body, data, tok)
log.Println("Error in send:", err)
unregistered := err != nil && isUnregisteredError(err)
if unregistered || delete {
_, err = redisConn.Do("SREM", "input-address-notification:"+tx.DestAddresses[index], tok)
if err != nil {
log.Printf("Error in notifyClientTransaction (SREM); set:%v member:%v error:%v", "input-address-notification:"+tx.DestAddresses[index], tok, err)
}

card, err := redis.Int(redisConn.Do("SCARD", "input-address-notification:"+tx.DestAddresses[index]))
if err != nil {
log.Printf("Error in notifyClientTransaction (SCARD); set:%v error:%v", "input-address-notification:"+tx.DestAddresses[index], err)
} else {
if card == 0 {
_, err = redisConn.Do("DEL", "input-address-notification:"+tx.DestAddresses[index])
if err != nil {
log.Printf("Error in notifyClientTransaction (DEL); set:%v error:%v", "input-address-notification:"+tx.DestAddresses[index], err)
}
}
}
unregisterTxNotification(tx, index, tok)
}
}
return nil, nil
})
}

func handleTransactionAddress(tx *lnrpc.Transaction, index int) error {
func getTxNotificationData(tx *lnrpc.Transaction, index int, msg string) ([]string, map[string]string, error) {
redisConn := redisPool.Get()
defer redisConn.Close()
tokens, err := redis.Strings(redisConn.Do("SMEMBERS", "input-address-notification:"+tx.DestAddresses[index]))
if err != nil {
log.Println("notifyUnconfirmed error:", err)
return nil, nil, err
}
data := map[string]string{
"msg": msg,
"tx": tx.TxHash,
"address": tx.DestAddresses[index],
"value": strconv.FormatInt(tx.Amount, 10),
}

return tokens, data, nil
}

func unregisterTxNotification(tx *lnrpc.Transaction, index int, tok string) {
redisConn := redisPool.Get()
defer redisConn.Close()

_, err := redisConn.Do("SREM", "input-address-notification:"+tx.DestAddresses[index], tok)
if err != nil {
log.Printf("Error in notifyClientTransaction (SREM); set:%v member:%v error:%v", "input-address-notification:"+tx.DestAddresses[index], tok, err)
}

card, err := redis.Int(redisConn.Do("SCARD", "input-address-notification:"+tx.DestAddresses[index]))
if err != nil {
log.Printf("Error in notifyClientTransaction (SCARD); set:%v error:%v", "input-address-notification:"+tx.DestAddresses[index], err)
} else {
if card == 0 {
_, err = redisConn.Do("DEL", "input-address-notification:"+tx.DestAddresses[index])
if err != nil {
log.Printf("Error in notifyClientTransaction (DEL); set:%v error:%v", "input-address-notification:"+tx.DestAddresses[index], err)
}
}
}
}

func handleTransactionAddress(tx *lnrpc.Transaction, index int, redisConn redis.Conn) error {
_, err := redisConn.Do("HMSET", "input-address:"+tx.DestAddresses[index],
"tx:TxHash", tx.TxHash,
"tx:Amount", tx.Amount,
Expand Down