diff options
Diffstat (limited to 'error.go')
| -rw-r--r-- | error.go | 18 |
1 files changed, 6 insertions, 12 deletions
@@ -3,7 +3,6 @@ package main import ( "errors" "fmt" - "os" "git.ophivana.moe/security/fortify/internal/app" "git.ophivana.moe/security/fortify/internal/fmsg" @@ -12,13 +11,13 @@ import ( func logWaitError(err error) { var e *fmsg.BaseError if !fmsg.AsBaseError(err, &e) { - fmt.Println("fortify: wait failed:", err) + fmsg.Println("wait failed:", err) } else { // Wait only returns either *app.ProcessError or *app.StateStoreError wrapped in a *app.BaseError var se *app.StateStoreError if !errors.As(err, &se) { // does not need special handling - fmt.Print("fortify: " + e.Message()) + fmsg.Print(e.Message()) } else { // inner error are either unwrapped store errors // or joined errors returned by *appSealTx revert @@ -26,7 +25,7 @@ func logWaitError(err error) { var ej app.RevertCompoundError if !errors.As(se.InnerErr, &ej) { // does not require special handling - fmt.Print("fortify: " + e.Message()) + fmsg.Print(e.Message()) } else { errs := ej.Unwrap() @@ -35,10 +34,10 @@ func logWaitError(err error) { var eb *fmsg.BaseError if !errors.As(ei, &eb) { // unreachable - fmt.Println("fortify: invalid error type returned by revert:", ei) + fmsg.Println("invalid error type returned by revert:", ei) } else { // print inner *app.BaseError message - fmt.Print("fortify: " + eb.Message()) + fmsg.Print(eb.Message()) } } } @@ -50,13 +49,8 @@ func logBaseError(err error, message string) { var e *fmsg.BaseError if fmsg.AsBaseError(err, &e) { - fmt.Print("fortify: " + e.Message()) + fmsg.Print(e.Message()) } else { fmt.Println(message, err) } } - -func fatalf(format string, a ...any) { - fmt.Printf("fortify: "+format, a...) - os.Exit(1) -} |