Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: catch panic earlier (#517)

Guilherme Oenning3522a3bf2eb2
diff --git a/app/middlewares/setup.go b/app/middlewares/setup.go
index f08625e48..75f32e114 100644
--- a/app/middlewares/setup.go
+++ b/app/middlewares/setup.go
@@ -49,15 +49,6 @@ func WorkerSetup() worker.MiddlewareFunc {
trx.SetLogger(c.Logger())
- c.SetServices(&app.Services{
- Tenants: postgres.NewTenantStorage(trx),
- Users: postgres.NewUserStorage(trx),
- Posts: postgres.NewPostStorage(trx),
- Tags: postgres.NewTagStorage(trx),
- Notifications: postgres.NewNotificationStorage(trx),
- Emailer: newEmailer(c.Logger()),
- })
-
//In case it panics somewhere
defer func() {
if r := recover(); r != nil {
@@ -74,6 +65,15 @@ func WorkerSetup() worker.MiddlewareFunc {
}
}()
+ c.SetServices(&app.Services{
+ Tenants: postgres.NewTenantStorage(trx),
+ Users: postgres.NewUserStorage(trx),
+ Posts: postgres.NewPostStorage(trx),
+ Tags: postgres.NewTagStorage(trx),
+ Notifications: postgres.NewNotificationStorage(trx),
+ Emailer: newEmailer(c.Logger()),
+ })
+
//Execute the chain
if err = next(c); err != nil {
trx.Rollback()
@@ -117,6 +117,23 @@ func WebSetup() web.MiddlewareFunc {
"ClientIP": c.Request.ClientIP,
})
+ //In case it panics somewhere
+ defer func() {
+ if r := recover(); r != nil {
+ err, ok := r.(error)
+ if !ok {
+ err = fmt.Errorf("%v", r)
+ }
+ c.Failure(err)
+ c.Rollback()
+ c.Logger().Infof("@{HttpMethod:magenta} @{URL:magenta} panicked in @{ElapsedMs:magenta}ms (rolled back)", log.Props{
+ "HttpMethod": c.Request.Method,
+ "URL": c.Request.URL.String(),
+ "ElapsedMs": time.Since(start).Nanoseconds() / int64(time.Millisecond),
+ })
+ }
+ }()
+
trx, err := c.Engine().Database().Begin()
if err != nil {
err = c.Failure(err)
@@ -144,23 +161,6 @@ func WebSetup() web.MiddlewareFunc {
Emailer: newEmailer(c.Logger()),
})
- //In case it panics somewhere
- defer func() {
- if r := recover(); r != nil {
- err, ok := r.(error)
- if !ok {
- err = fmt.Errorf("%v", r)
- }
- c.Failure(err)
- c.Rollback()
- c.Logger().Infof("@{HttpMethod:magenta} @{URL:magenta} panicked in @{ElapsedMs:magenta}ms (rolled back)", log.Props{
- "HttpMethod": c.Request.Method,
- "URL": c.Request.URL.String(),
- "ElapsedMs": time.Since(start).Nanoseconds() / int64(time.Millisecond),
- })
- }
- }()
-
//Execute the chain
if err := next(c); err != nil {
c.Rollback()