LBRYCommunity/lbry.go
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 46 Packages Wiki Activity

add regtest support

Browse source 
improve error handling
This commit is contained in:
Niko Storni 2018-05-17 13:37:12 -04:00
parent bf7b7c0ca6
commit d0cfcaa3e5
No known key found for this signature in database
GPG key ID: F37FE63398800368
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/selfsync.go
View file

@ -193,6 +193,7 @@ func selfSync(cmd *cobra.Command, args []string) {
fatalErrors := []string{
"default_wallet already exists",
"WALLET HAS NOT BEEN MOVED TO THE WALLET BACKUP DIR",
"Initial wallet setup failed! Manual Intervention is required.",
}
if util.InSliceContains(err.Error(), fatalErrors) {
util.SendToSlackError("@Nikooo777 this requires manual intervention! Exiting...")

1
cmd/ytsync.go
View file

@ -86,7 +86,6 @@ func ytsync(cmd *cobra.Command, args []string) {
if err != nil {
util.SendToSlackError(errors.FullTrace(err))
}
util.SendToSlackInfo("Syncing " + lbryChannelName + " reached an end.")
}

3
lbrycrd/client.go
View file

@ -144,6 +144,9 @@ func getLbrycrdURLFromConfFile() (string, error) {
}
defaultConfFile := os.Getenv("HOME") + "/.lbrycrd/lbrycrd.conf"
if os.Getenv("REGTEST") == "true" {
defaultConfFile = os.Getenv("HOME") + "/.lbrycrd_regtest/lbrycrd.conf"
}
if _, err := os.Stat(defaultConfFile); os.IsNotExist(err) {
return "", errors.Err("default lbrycrd conf file not found")
}

8
ytsync/ytsync.go
View file

@ -85,8 +85,10 @@ func (s *Sync) FullCycle() error {
}
s.YoutubeChannelID = channelID
}
defaultWalletDir := os.Getenv("HOME") + "/.lbryum/wallets/default_wallet"
if os.Getenv("REGTEST") == "true" {
defaultWalletDir = os.Getenv("HOME") + "/.lbryum_regtest/wallets/default_wallet"
}
walletBackupDir := os.Getenv("HOME") + "/wallets/" + strings.Replace(s.LbryChannelName, "@", "", 1)
if _, err := os.Stat(defaultWalletDir); !os.IsNotExist(err) {
@ -185,7 +187,7 @@ func (s *Sync) doSync() error {
err = s.walletSetup()
if err != nil {
return err
return errors.Err("Initial wallet setup failed! Manual Intervention is required. Reason: %v", err)
}
if s.StopOnError {
@ -276,7 +278,7 @@ func (s *Sync) startWorker(workerNum int) {
log.Println("Retrying")
continue
}
util.SendToSlackError("Video failed after %d retries, skipping. Stack: %s", s.MaxTries, logMsg)
util.SendToSlackError("Video failed after %d retries, skipping. Stack: %s", tryCount, logMsg)
}
}
break