Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

bugfix: make database logs run sync (#460)

Guilherme Oenning9d9bb8528441
diff --git a/app/pkg/log/database/logger.go b/app/pkg/log/database/logger.go
index 1f8f6a402..ac6775bb9 100644
--- a/app/pkg/log/database/logger.go
+++ b/app/pkg/log/database/logger.go
@@ -120,39 +120,31 @@ func (l *Logger) log(level log.Level, message string, props log.Props) {
return
}
- write := func() {
- props = l.props.Merge(props)
- trx, err := l.db.Begin()
- if err != nil {
- l.console.Error(errors.Wrap(err, "failed to open transaction"))
- return
- }
- trx.NoLogs()
+ props = l.props.Merge(props)
+ trx, err := l.db.Begin()
+ if err != nil {
+ l.console.Error(errors.Wrap(err, "failed to open transaction"))
+ return
+ }
+ trx.NoLogs()
- message = log.Parse(message, props, false)
+ message = log.Parse(message, props, false)
- _, err = trx.Execute(
- "INSERT INTO logs (tag, level, text, created_on, properties) VALUES ($1, $2, $3, $4, $5)",
- l.tag, level.String(), message, time.Now(), props,
- )
+ _, err = trx.Execute(
+ "INSERT INTO logs (tag, level, text, created_on, properties) VALUES ($1, $2, $3, $4, $5)",
+ l.tag, level.String(), message, time.Now(), props,
+ )
+ if err != nil {
+ l.console.Error(errors.Wrap(err, "failed to insert log"))
+ err = trx.Rollback()
if err != nil {
- l.console.Error(errors.Wrap(err, "failed to insert log"))
- err = trx.Rollback()
- if err != nil {
- l.console.Error(errors.Wrap(err, "failed to rollback transaction"))
- }
- } else {
- err = trx.Commit()
- if err != nil {
- l.console.Error(errors.Wrap(err, "failed to commit transaction"))
- }
+ l.console.Error(errors.Wrap(err, "failed to rollback transaction"))
}
- }
-
- if env.IsTest() {
- write()
} else {
- go write()
+ err = trx.Commit()
+ if err != nil {
+ l.console.Error(errors.Wrap(err, "failed to commit transaction"))
+ }
}
}