Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: write logs on a separate goroutine (#725)

Guilherme Oenning091abba495ad
diff --git a/app/pkg/log/database/logger.go b/app/pkg/log/database/logger.go
index bb01e9609..94c5972c5 100644
--- a/app/pkg/log/database/logger.go
+++ b/app/pkg/log/database/logger.go
@@ -133,31 +133,17 @@ func (l *Logger) log(level log.Level, message string, props log.Props) {
}
props = l.props.Merge(props)
- trx, err := l.db.Begin()
- if err != nil {
- l.console.Error(errors.Wrap(err, "failed to open transaction"))
- return
- }
-
message = log.Parse(message, props, false)
- trx.NoLogs()
- _, err = trx.Execute(
+ go l.fireAndForgetLog(level, message, props)
+}
+
+func (l *Logger) fireAndForgetLog(level log.Level, message string, props log.Props) {
+ _, err := l.db.Connection().Exec(
"INSERT INTO logs (tag, level, text, created_at, properties) VALUES ($1, $2, $3, $4, $5)",
l.tag, level.String(), message, time.Now(), props,
)
- trx.ResumeLogs()
-
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"))
- }
}
}
diff --git a/app/pkg/log/database/logger_test.go b/app/pkg/log/database/logger_test.go
index b17f4ce40..1e1d6341e 100644
--- a/app/pkg/log/database/logger_test.go
+++ b/app/pkg/log/database/logger_test.go
@@ -19,8 +19,9 @@ func TestLog(t *testing.T) {
RegisterT(t)
db := dbx.New()
defer db.Close()
+ db.Connection().Exec("DELETE FROM logs WHERE properties->>'ContextID' = 'MyContextID'")
+
trx, _ := db.Begin()
- trx.Execute("DELETE FROM logs WHERE properties->>'ContextID' = 'MyContextID'")
defer trx.Commit()
logger := database.NewLogger("TEST", db)
@@ -31,6 +32,12 @@ func TestLog(t *testing.T) {
logger.Infof("2 + 2 is @{Result}", log.Props{"Result": 4})
logger.Debugf("2 + 2 is @{Result}", log.Props{"Result": 4})
+ Expect(func() int {
+ count, err := trx.Count("SELECT * FROM logs WHERE properties->>'ContextID' = 'MyContextID'")
+ Expect(err).IsNil()
+ return count
+ }).EventuallyEquals(1)
+
var entries []*logEntry
err := trx.Select(&entries, "SELECT tag, level, text FROM logs WHERE properties->>'ContextID' = 'MyContextID'")
Expect(err).IsNil()