Fixed non working panic recoverer (#536)

go-co-op · Aug 8, 2023 · ae66864 · ae66864
1 parent da05a0d
commit ae66864
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/executor.go b/executor.go
@@ -70,6 +70,16 @@ func newExecutor() executor {
 }
 
 func runJob(f jobFunction) {
+	panicHandlerMutex.RLock()
+	defer panicHandlerMutex.RUnlock()
+
+	if panicHandler != nil {
+		defer func() {
+			if r := recover(); r != nil {
+				panicHandler(f.funcName, r)
+			}
+		}()
+	}
 	f.runStartCount.Add(1)
 	f.isRunning.Store(true)
 	callJobFunc(f.eventListeners.onBeforeJobExecution)
@@ -209,17 +219,6 @@ func (e *executor) run() {
 			go func() {
 				defer e.jobsWg.Done()
 
-				panicHandlerMutex.RLock()
-				defer panicHandlerMutex.RUnlock()
-
-				if panicHandler != nil {
-					defer func() {
-						if r := recover(); r != nil {
-							panicHandler(f.funcName, r)
-						}
-					}()
-				}
-
 				if e.limitModeMaxRunningJobs > 0 {
 					switch e.limitMode {
 					case RescheduleMode: