Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: use console logger for migration (#657)

Guilherme Oenninge98fdff11f08
diff --git a/app/cmd/migrate.go b/app/cmd/migrate.go
index d15ac1dee..49543f068 100644
--- a/app/cmd/migrate.go
+++ b/app/cmd/migrate.go
@@ -3,19 +3,18 @@ package cmd
import (
"github.com/getfider/fider/app/pkg/dbx"
"github.com/getfider/fider/app/pkg/log"
- "github.com/getfider/fider/app/pkg/log/database"
+ "github.com/getfider/fider/app/pkg/log/console"
"github.com/getfider/fider/app/pkg/rand"
)
// RunMigrate run all pending migrations on current DATABASE_URL
// Returns an exitcode, 0 for OK and 1 for ERROR
func RunMigrate() int {
- db := dbx.New()
- logger := database.NewLogger("MIGRATE", db)
+ logger := console.NewLogger("MIGRATE")
logger.SetProperty(log.PropertyKeyContextID, rand.String(32))
- db.SetLogger(logger)
-
+ db := dbx.NewWithLogger(logger)
defer db.Close()
+
err := db.Migrate("/migrations")
if err != nil {
logger.Error(err)
diff --git a/app/pkg/dbx/dbx.go b/app/pkg/dbx/dbx.go
index 37ed25c3e..7aa7a701b 100644
--- a/app/pkg/dbx/dbx.go
+++ b/app/pkg/dbx/dbx.go
@@ -102,9 +102,14 @@ func (trx *Trx) SetLogger(logger log.Logger) {
trx.logger = logger
}
-// NoLogs disable logs from this transaction
+// NoLogs disable logs for this transaction
func (trx *Trx) NoLogs() {
- trx.logger.SetLevel(log.NONE)
+ trx.logger.Disable()
+}
+
+// ResumeLogs resume logs for this transaction
+func (trx *Trx) ResumeLogs() {
+ trx.logger.Enable()
}
// Execute given SQL command
diff --git a/app/pkg/log/console/logger.go b/app/pkg/log/console/logger.go
index f8032f25a..b5f8be630 100644
--- a/app/pkg/log/console/logger.go
+++ b/app/pkg/log/console/logger.go
@@ -13,23 +13,35 @@ import (
// Logger output messages to console
type Logger struct {
- logger *stdLog.Logger
- level log.Level
- tag string
- props log.Props
+ logger *stdLog.Logger
+ level log.Level
+ tag string
+ props log.Props
+ enabled bool
}
// NewLogger creates a new Logger
func NewLogger(tag string) *Logger {
level := strings.ToUpper(env.GetEnvOrDefault("LOG_LEVEL", ""))
return &Logger{
- tag: tag,
- logger: stdLog.New(os.Stdout, "", 0),
- level: log.ParseLevel(level),
- props: make(log.Props, 0),
+ tag: tag,
+ logger: stdLog.New(os.Stdout, "", 0),
+ level: log.ParseLevel(level),
+ props: make(log.Props, 0),
+ enabled: !env.IsTest(),
}
}
+// Disable logs for this logger
+func (l *Logger) Disable() {
+ l.enabled = false
+}
+
+// Enable logs for this logger
+func (l *Logger) Enable() {
+ l.enabled = true
+}
+
// SetLevel increases/decreases current log level
func (l *Logger) SetLevel(level log.Level) {
l.level = level
@@ -37,7 +49,7 @@ func (l *Logger) SetLevel(level log.Level) {
// IsEnabled returns true if given level is enabled
func (l *Logger) IsEnabled(level log.Level) bool {
- return level >= l.level
+ return l.enabled && level >= l.level
}
// Debug logs a DEBUG message
@@ -105,7 +117,6 @@ func (l *Logger) log(level log.Level, message string, props log.Props) {
if !l.IsEnabled(level) {
return
}
-
message = log.Parse(message, props, true)
contextID := l.props[log.PropertyKeyContextID]
l.logger.Printf("%s [%s] [%s] [%s] %s\n", colorizeLevel(level), time.Now().Format(time.RFC3339), l.tag, contextID, message)
diff --git a/app/pkg/log/database/logger.go b/app/pkg/log/database/logger.go
index 7314e2934..c506b47dc 100644
--- a/app/pkg/log/database/logger.go
+++ b/app/pkg/log/database/logger.go
@@ -20,6 +20,7 @@ type Logger struct {
level log.Level
tag string
props log.Props
+ enabled bool
}
// NewLogger creates a new Logger
@@ -31,9 +32,20 @@ func NewLogger(tag string, db *dbx.Database) *Logger {
console: console.NewLogger(tag),
level: log.ParseLevel(level),
props: make(log.Props, 0),
+ enabled: true,
}
}
+// Disable logs for this logger
+func (l *Logger) Disable() {
+ l.enabled = false
+}
+
+// Enable logs for this logger
+func (l *Logger) Enable() {
+ l.enabled = true
+}
+
// SetLevel increases/decreases current log level
func (l *Logger) SetLevel(level log.Level) {
l.level = level
@@ -42,7 +54,7 @@ func (l *Logger) SetLevel(level log.Level) {
// IsEnabled returns true if given level is enabled
func (l *Logger) IsEnabled(level log.Level) bool {
- return level >= l.level
+ return l.enabled && level >= l.level
}
// Debug logs a DEBUG message
@@ -126,14 +138,15 @@ func (l *Logger) log(level log.Level, message string, props log.Props) {
l.console.Error(errors.Wrap(err, "failed to open transaction"))
return
}
- trx.NoLogs()
message = log.Parse(message, props, false)
+ trx.NoLogs()
_, err = trx.Execute(
"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"))
diff --git a/app/pkg/log/log.go b/app/pkg/log/log.go
index 67a175de2..9d047e2cf 100644
--- a/app/pkg/log/log.go
+++ b/app/pkg/log/log.go
@@ -13,6 +13,8 @@ type Level uint8
// Logger defines the logging interface.
type Logger interface {
+ Disable()
+ Enable()
SetLevel(level Level)
SetProperty(key string, value interface{})
Debug(message string)
diff --git a/app/pkg/log/noop/logger.go b/app/pkg/log/noop/logger.go
index bef398919..ec3efe245 100644
--- a/app/pkg/log/noop/logger.go
+++ b/app/pkg/log/noop/logger.go
@@ -1,9 +1,12 @@
package noop
-import "github.com/getfider/fider/app/pkg/log"
+import (
+ "github.com/getfider/fider/app/pkg/log"
+)
// Logger doesn't log anything
type Logger struct {
+ enabled bool
}
// NewLogger creates a new Logger
@@ -11,6 +14,14 @@ func NewLogger() *Logger {
return &Logger{}
}
+// Disable logs for this logger
+func (l *Logger) Disable() {
+}
+
+// Enable logs for this logger
+func (l *Logger) Enable() {
+}
+
// SetLevel increases/decreases current log level
func (l *Logger) SetLevel(level log.Level) {
}
diff --git a/docker-compose.yml b/docker-compose.yml
index 169b9458d..74cd09d00 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,7 @@
version: '2'
services:
pgdev:
+ container_name: fider_pgdev
restart: always
image: postgres:9.6.8
volumes:
@@ -11,6 +12,7 @@ services:
POSTGRES_USER: fider
POSTGRES_PASSWORD: fider_pw
pgtest:
+ container_name: fider_pgtest
restart: always
image: postgres:9.6.8
ports: