lbrynet/lbrycrd wallet management #34

Merged
nikooo777 merged 4 commits from wallets-refactor into master 2018-08-20 14:09:06 +02:00
2 changed files with 15 additions and 4 deletions
Showing only changes of commit 758b68c751 - Show all commits

View file

@ -159,6 +159,10 @@ func (s SyncManager) MarkVideoStatus(channelID string, videoID string, status st
vals.Add("claim_name", claimName) vals.Add("claim_name", claimName)
} }
if failureReason != "" { if failureReason != "" {
maxReasonLength := 500
if len(failureReason) > maxReasonLength {
failureReason = failureReason[:500]
}
vals.Add("failure_reason", failureReason) vals.Add("failure_reason", failureReason)
} }
res, _ := http.PostForm(endpoint, vals) res, _ := http.PostForm(endpoint, vals)

View file

@ -445,14 +445,21 @@ func (s *Sync) startWorker(workerNum int) {
log.Println("This error should not be retried at all") log.Println("This error should not be retried at all")
} else if tryCount < s.MaxTries { } else if tryCount < s.MaxTries {
if strings.Contains(err.Error(), "txn-mempool-conflict") || if strings.Contains(err.Error(), "txn-mempool-conflict") ||
strings.Contains(err.Error(), "failed: Not enough funds") ||
strings.Contains(err.Error(), "Error in daemon: Insufficient funds, please deposit additional LBC") ||
strings.Contains(err.Error(), "too-long-mempool-chain") { strings.Contains(err.Error(), "too-long-mempool-chain") {
log.Println("waiting for a block and refilling addresses before retrying") log.Println("waiting for a block before retrying")
err = s.waitForNewBlock()
if err != nil {
s.grp.Stop()
SendErrorToSlack("something went wrong while waiting for a block: %v", err)
break
}
} else if strings.Contains(err.Error(), "failed: Not enough funds") ||
strings.Contains(err.Error(), "Error in daemon: Insufficient funds, please deposit additional LBC") {
log.Println("refilling addresses before retrying")
err = s.walletSetup() err = s.walletSetup()
if err != nil { if err != nil {
s.grp.Stop() s.grp.Stop()
SendErrorToSlack("Failed to setup the wallet for a refill: %v", err) SendErrorToSlack("failed to setup the wallet for a refill: %v", err)
break break
} }
} }