remove unused code, remove panicked bool from middleware

deepfence · Sep 8, 2023 · dca986a · dca986a
1 parent 6bc58f4
commit dca986a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 24 deletions.
diff --git a/deepfence_worker/utils/watermill.go b/deepfence_worker/utils/watermill.go
@@ -29,18 +29,16 @@ func (p RecoveredPanicError) Error() string {
 // to any error returned from the handler.
 func Recoverer(h message.HandlerFunc) message.HandlerFunc {
 	return func(event *message.Message) (events []*message.Message, err error) {
-		panicked := true
 
 		defer func() {
-			if r := recover(); r != nil || panicked {
+			if r := recover(); r != nil {
 				err = errors.WithStack(RecoveredPanicError{V: r, Stacktrace: string(debug.Stack())})
 				// ack message as we don't want to execute panic message again
 				event.Ack()
 			}
 		}()
 
 		events, err = h(event)
-		panicked = false
 		return events, err
 	}
 }

diff --git a/deepfence_worker/worker.go b/deepfence_worker/worker.go
@@ -349,24 +349,3 @@ func startWorker(wml watermill.LoggerAdapter, cfg config) error {
 	cancel()
 	return nil
 }
-
-// func LogErrorWrapper(wrapped func(*message.Message) error) func(*message.Message) error {
-// 	return func(msg *message.Message) error {
-// 		err := wrapped(msg)
-// 		if err != nil {
-// 			log.Error().Msgf("Cron job err: %v", err)
-// 		}
-// 		return nil
-// 	}
-// }
-
-// func LogErrorsWrapper(wrapped func(*message.Message) ([]*message.Message, error)) func(*message.Message) ([]*message.Message, error) {
-// 	return func(msg *message.Message) ([]*message.Message, error) {
-// 		msgs, err := wrapped(msg)
-// 		if err != nil {
-// 			log.Error().Msgf("Cron job err: %v", err)
-// 			return nil, nil
-// 		}
-// 		return msgs, nil
-// 	}
-// }