From 758b68c7515bc0d301e19f9b634f7147bf2ba344 Mon Sep 17 00:00:00 2001
From: Niko Storni <niko@lbry.io>
Date: Thu, 9 Aug 2018 20:04:39 -0400
Subject: [PATCH] various bug fixes

---
 ytsync/manager.go |  4 ++++
 ytsync/ytsync.go  | 15 +++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ytsync/manager.go b/ytsync/manager.go
index bc38810..0827344 100644
--- a/ytsync/manager.go
+++ b/ytsync/manager.go
@@ -159,6 +159,10 @@ func (s SyncManager) MarkVideoStatus(channelID string, videoID string, status st
 		vals.Add("claim_name", claimName)
 	}
 	if failureReason != "" {
+		maxReasonLength := 500
+		if len(failureReason) > maxReasonLength {
+			failureReason = failureReason[:500]
+		}
 		vals.Add("failure_reason", failureReason)
 	}
 	res, _ := http.PostForm(endpoint, vals)
diff --git a/ytsync/ytsync.go b/ytsync/ytsync.go
index 808b4f6..b01e974 100644
--- a/ytsync/ytsync.go
+++ b/ytsync/ytsync.go
@@ -445,14 +445,21 @@ func (s *Sync) startWorker(workerNum int) {
 						log.Println("This error should not be retried at all")
 					} else if tryCount < s.MaxTries {
 						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") {
-							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()
 							if err != nil {
 								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
 							}
 						}