Mikescher/SimpleCloudNotifier
1
0
Fork 0
Code Pull Requests Actions Releases Activity

BF

Browse Source
This commit is contained in:
Mike Schwörer 2023-01-24 13:52:11 +01:00
parent e05d88682a
commit 27b189d33a
Signed by: Mikescher
GPG Key ID: D3C7172E0A70F8CF
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scnserver/api/ginext/cors.go
View File

@ -10,7 +10,7 @@ func CorsMiddleware() gin.HandlerFunc {
c.Writer.Header().Set("Access-Control-Allow-Origin", "*") c.Writer.Header().Set("Access-Control-Allow-Origin", "*")
c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") 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-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" { if c.Request.Method == "OPTIONS" {
c.AbortWithStatus(http.StatusOK) c.AbortWithStatus(http.StatusOK)

3
scnserver/jobs/DeliveryRetryJob.go
View File

@ -73,7 +73,6 @@ func (j *DeliveryRetryJob) mainLoop() {
break break
} else if signal == "run" { } else if signal == "run" {
log.Info().Msg(fmt.Sprintf("Job [%s] received <run> signal", j.name)) log.Info().Msg(fmt.Sprintf("Job [%s] received <run> signal", j.name))
continue
} else { } else {
log.Error().Msg(fmt.Sprintf("Received unknown job signal: <%s> in job [%s]", signal, j.name)) 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) { func (j *DeliveryRetryJob) execute() (fastrr bool, err error) {
defer func() { defer func() {
if rec := recover(); rec != nil { 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)) err = errors.New(fmt.Sprintf("Panic recovered: %v", rec))
fastrr = false fastrr = false
} }

6
scnserver/jobs/RequestLogCleanupJob.go
View File

@ -17,8 +17,8 @@ type RequestLogCleanupJob struct {
sigChannel chan string sigChannel chan string
} }
func NewRequestLogCleanupJob(app *logic.Application) *DeliveryRetryJob { func NewRequestLogCleanupJob(app *logic.Application) *RequestLogCleanupJob {
return &DeliveryRetryJob{ return &RequestLogCleanupJob{
app: app, app: app,
name: "RequestLogCleanupJob", name: "RequestLogCleanupJob",
isRunning: syncext.NewAtomicBool(false), isRunning: syncext.NewAtomicBool(false),
@ -95,7 +95,7 @@ func (j *RequestLogCleanupJob) mainLoop() {
func (j *RequestLogCleanupJob) execute() (err error) { func (j *RequestLogCleanupJob) execute() (err error) {
defer func() { defer func() {
if rec := recover(); rec != nil { 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)) err = errors.New(fmt.Sprintf("Panic recovered: %v", rec))
} }
}() }()