Error handling refactor (#446)

* refactor: error handling Signed-off-by: Jingfu Wang <[email protected]> * refactor: update message Signed-off-by: Jingfu Wang <[email protected]> Signed-off-by: Jingfu Wang <[email protected]>
coinbase · Sep 20, 2022 · 1cc6016 · 1cc6016
1 parent 33738c2
commit 1cc6016
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/constructor/dsl/dsl.go b/constructor/dsl/dsl.go
@@ -52,7 +52,7 @@ func Parse(ctx context.Context, file string) ([]*job.Workflow, *Error) {
 	}
 	defer func() {
 		if err := f.Close(); err != nil {
-			log.Printf("%s: could not close %s\n", err.Error(), cleanedPath)
+			log.Printf("could not close %s: %s\n", cleanedPath, err.Error())
 		}
 	}()
 

diff --git a/fetcher/utils.go b/fetcher/utils.go
@@ -104,11 +104,11 @@ func tryAgain(fetchMsg string, thisBackoff *Backoff, err *Error) *Error {
 
 	thisBackoff.attempts++
 	log.Printf(
-		"%s: retrying fetch for %s after %fs (prior attempts: %d)\n",
-		errMessage,
+		"retrying fetch for %s after %fs (prior attempts: %d): %s\n",
 		fetchMsg,
 		nextBackoff.Seconds(),
 		thisBackoff.attempts,
+		errMessage,
 	)
 	time.Sleep(nextBackoff)
 

diff --git a/parser/intent.go b/parser/intent.go
@@ -131,9 +131,9 @@ func (p *Parser) ExpectedOperations(
 
 		if len(failedMatches) > 0 {
 			errString += fmt.Sprintf(
-				"%s: found matching ops with unsuccessful status %s",
-				errString,
+				"found matching ops with unsuccessful status %s: %s",
 				types.PrettyPrintStruct(failedMatches),
+				errString,
 			)
 		}
 

diff --git a/reconciler/reconciler.go b/reconciler/reconciler.go
@@ -95,7 +95,7 @@ func (r *Reconciler) wrappedActiveEnqueue(
 			change.Currency,
 			BacklogFull,
 		); err != nil {
-			log.Printf("%s: reconciliation skipped handling failed\n", err.Error())
+			log.Printf("reconciliation skipped handling failed: %s\n", err.Error())
 		}
 	}
 }
@@ -106,9 +106,9 @@ func (r *Reconciler) wrappedInactiveEnqueue(
 ) {
 	if err := r.inactiveAccountQueue(true, accountCurrency, liveBlock, false); err != nil {
 		log.Printf(
-			"%s: unable to queue account %s",
-			err.Error(),
+			"unable to queue account %s: %s",
 			types.PrintStruct(accountCurrency),
+			err.Error(),
 		)
 	}
 }

diff --git a/storage/modules/balance_storage.go b/storage/modules/balance_storage.go
@@ -884,8 +884,11 @@ func (b *BalanceStorage) UpdateBalance(
 
 	if bigNewVal.Sign() == -1 {
 		return false, fmt.Errorf(
-			"%s is invalid: %w",
+			"account balance %s of currency %s for account %s at block %s is invalid: %w",
 			newVal,
+			types.PrintStruct(change.Currency),
+			types.PrintStruct(change.Account),
+			types.PrintStruct(change.Block),
 			storageErrs.ErrNegativeBalance,
 		)
 	}

diff --git a/storage/modules/broadcast_storage.go b/storage/modules/broadcast_storage.go
@@ -443,9 +443,9 @@ func (b *BroadcastStorage) performBroadcast(
 	if err != nil {
 		// Don't error on broadcast failure, retries will automatically be handled.
 		log.Printf(
-			"%s: unable to broadcast transaction %s",
-			err.Error(),
+			"unable to broadcast transaction %s: %s",
 			broadcast.TransactionIdentifier.Hash,
+			err.Error(),
 		)
 
 		return nil