From 27b189d33af6647dce13f65f59422cfcdf0ab25e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= <pubgit@mikescher.com>
Date: Tue, 24 Jan 2023 13:52:11 +0100
Subject: [PATCH] BF

---
 scnserver/api/ginext/cors.go           | 2 +-
 scnserver/jobs/DeliveryRetryJob.go     | 3 +--
 scnserver/jobs/RequestLogCleanupJob.go | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/scnserver/api/ginext/cors.go b/scnserver/api/ginext/cors.go
index ac6ab02..a4f638f 100644
--- a/scnserver/api/ginext/cors.go
+++ b/scnserver/api/ginext/cors.go
@@ -10,7 +10,7 @@ func CorsMiddleware() gin.HandlerFunc {
 		c.Writer.Header().Set("Access-Control-Allow-Origin", "*")
 		c.Writer.Header().Set("Access-Control-Allow-Credentials", "true")
 		c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With")
-		c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT")
+		c.Writer.Header().Set("Access-Control-Allow-Methods", "OPTIONS, GET, POST, PUT, PATCH, DELETE")
 
 		if c.Request.Method == "OPTIONS" {
 			c.AbortWithStatus(http.StatusOK)
diff --git a/scnserver/jobs/DeliveryRetryJob.go b/scnserver/jobs/DeliveryRetryJob.go
index 237f712..7e01af5 100644
--- a/scnserver/jobs/DeliveryRetryJob.go
+++ b/scnserver/jobs/DeliveryRetryJob.go
@@ -73,7 +73,6 @@ func (j *DeliveryRetryJob) mainLoop() {
 				break
 			} else if signal == "run" {
 				log.Info().Msg(fmt.Sprintf("Job [%s] received <run> signal", j.name))
-				continue
 			} else {
 				log.Error().Msg(fmt.Sprintf("Received unknown job signal: <%s> in job [%s]", signal, j.name))
 			}
@@ -100,7 +99,7 @@ func (j *DeliveryRetryJob) mainLoop() {
 func (j *DeliveryRetryJob) execute() (fastrr bool, err error) {
 	defer func() {
 		if rec := recover(); rec != nil {
-			log.Error().Interface("recover", rec).Msg("Recovered panic in DeliveryRetryJob")
+			log.Error().Interface("recover", rec).Msg("Recovered panic in " + j.name)
 			err = errors.New(fmt.Sprintf("Panic recovered: %v", rec))
 			fastrr = false
 		}
diff --git a/scnserver/jobs/RequestLogCleanupJob.go b/scnserver/jobs/RequestLogCleanupJob.go
index 57c0132..3c47aa3 100644
--- a/scnserver/jobs/RequestLogCleanupJob.go
+++ b/scnserver/jobs/RequestLogCleanupJob.go
@@ -17,8 +17,8 @@ type RequestLogCleanupJob struct {
 	sigChannel chan string
 }
 
-func NewRequestLogCleanupJob(app *logic.Application) *DeliveryRetryJob {
-	return &DeliveryRetryJob{
+func NewRequestLogCleanupJob(app *logic.Application) *RequestLogCleanupJob {
+	return &RequestLogCleanupJob{
 		app:        app,
 		name:       "RequestLogCleanupJob",
 		isRunning:  syncext.NewAtomicBool(false),
@@ -95,7 +95,7 @@ func (j *RequestLogCleanupJob) mainLoop() {
 func (j *RequestLogCleanupJob) execute() (err error) {
 	defer func() {
 		if rec := recover(); rec != nil {
-			log.Error().Interface("recover", rec).Msg("Recovered panic in DeliveryRetryJob")
+			log.Error().Interface("recover", rec).Msg("Recovered panic in " + j.name)
 			err = errors.New(fmt.Sprintf("Panic recovered: %v", rec))
 		}
 	}()