feat(plc4xanalyzer): handle panics in actions

apache · Nov 1, 2022 · d136f7a · d136f7a
1 parent f8b1de0
commit d136f7a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/plc4go/tools/plc4xpcapanalyzer/cmd/ui.go b/plc4go/tools/plc4xpcapanalyzer/cmd/ui.go
@@ -59,10 +59,10 @@ TODO: document me
 			}()
 		}
 
+		defer ui.Shutdown()
 		if err := application.Run(); err != nil {
 			panic(err)
 		}
-		ui.Shutdown()
 	},
 }
 

diff --git a/plc4go/tools/plc4xpcapanalyzer/ui/commands.go b/plc4go/tools/plc4xpcapanalyzer/ui/commands.go
@@ -34,6 +34,7 @@ import (
 	"os"
 	"path"
 	"reflect"
+	"runtime/debug"
 	"strings"
 	"time"
 )
@@ -665,7 +666,13 @@ func Execute(ctx context.Context, commandText string) error {
 	return err
 }
 
-func (c Command) Execute(ctx context.Context, commandText string) error {
+func (c Command) Execute(ctx context.Context, commandText string) (err error) {
+	defer func() {
+		if recoveredErr := recover(); recoveredErr != nil {
+			log.Debug().Msgf("Panic '%v' stack:\n%s", recoveredErr, debug.Stack())
+			err = errors.Errorf("panic occurred: %v.", recoveredErr)
+		}
+	}()
 	plc4xpcapanalyzerLog.Debug().Msgf("%s executes %s", c, commandText)
 	if !c.acceptsCurrentText(commandText) {
 		return errors.Errorf("%s doesn't understand %s", c.Name, commandText)