snapshot of https://github.com/traggo/server.git (master, 2026-09-16; blobs > 131072B omitted)
Some checks failed
build / build (push) Failing after 3s
Some checks failed
build / build (push) Failing after 3s
This commit is contained in:
69
logger/database.go
Normal file
69
logger/database.go
Normal file
@@ -0,0 +1,69 @@
|
||||
package logger
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"reflect"
|
||||
"regexp"
|
||||
"time"
|
||||
|
||||
"github.com/rs/zerolog/log"
|
||||
)
|
||||
|
||||
var (
|
||||
sqlRegexp = regexp.MustCompile(`\?`)
|
||||
)
|
||||
|
||||
// DatabaseLogger logs sql queries
|
||||
type DatabaseLogger struct {
|
||||
}
|
||||
|
||||
// Print pretty prints the gorm.DB log values
|
||||
// Mostly copied from https://github.com/jinzhu/gorm/blob/master/logger.go
|
||||
func (l *DatabaseLogger) Print(values ...interface{}) {
|
||||
if len(values) > 1 {
|
||||
var (
|
||||
sql string
|
||||
formattedValues []string
|
||||
level = values[0]
|
||||
)
|
||||
|
||||
if level == "sql" {
|
||||
for _, value := range values[4].([]interface{}) {
|
||||
indirectValue := reflect.Indirect(reflect.ValueOf(value))
|
||||
if indirectValue.IsValid() {
|
||||
value = indirectValue.Interface()
|
||||
if t, ok := value.(time.Time); ok {
|
||||
formattedValues = append(formattedValues, fmt.Sprintf("'%v'", t.Format("2006-01-02 15:04:05")))
|
||||
} else if _, ok := value.([]byte); ok {
|
||||
formattedValues = append(formattedValues, "'<binary>'")
|
||||
} else {
|
||||
formattedValues = append(formattedValues, fmt.Sprintf("'%v'", value))
|
||||
}
|
||||
} else {
|
||||
formattedValues = append(formattedValues, "NULL")
|
||||
}
|
||||
}
|
||||
|
||||
formattedValuesLength := len(formattedValues)
|
||||
for index, value := range sqlRegexp.Split(values[3].(string), -1) {
|
||||
sql += value
|
||||
if index < formattedValuesLength {
|
||||
sql += formattedValues[index]
|
||||
}
|
||||
}
|
||||
|
||||
log.Debug().Str("took", values[2].(time.Duration).String()).Int64("rows", values[5].(int64)).Msg("SQL: " + sql)
|
||||
} else if level == "log" {
|
||||
if len(values) > 2 {
|
||||
if err, ok := values[2].(error); ok {
|
||||
log.Error().Err(err).Msg("Database error")
|
||||
return
|
||||
}
|
||||
}
|
||||
log.Debug().Msg(fmt.Sprint(values[2:]...))
|
||||
} else {
|
||||
log.Error().Msgf("DatabaseLogger: cannot handle level %#v", level)
|
||||
}
|
||||
}
|
||||
// ignore empty log
|
||||
}
|
||||
96
logger/database_test.go
Normal file
96
logger/database_test.go
Normal file
@@ -0,0 +1,96 @@
|
||||
package logger_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/rs/zerolog"
|
||||
"github.com/traggo/server/logger"
|
||||
"github.com/traggo/server/test"
|
||||
)
|
||||
|
||||
type Test struct {
|
||||
Password []byte
|
||||
NullValue *string
|
||||
Placeholder string
|
||||
Date time.Time
|
||||
Number uint
|
||||
}
|
||||
|
||||
func TestDatabaseLogger_Success(t *testing.T) {
|
||||
someTime, _ := time.Parse("2006/01/02", "2017/01/02")
|
||||
db := test.InMemoryDB(t)
|
||||
defer db.Close()
|
||||
db.AutoMigrate(&Test{})
|
||||
|
||||
fakeLog := test.NewLogger(t)
|
||||
defer fakeLog.Dispose()
|
||||
|
||||
db.Create(&Test{
|
||||
Password: []byte{1},
|
||||
Date: someTime,
|
||||
NullValue: nil,
|
||||
Number: 1,
|
||||
Placeholder: "hello there",
|
||||
})
|
||||
|
||||
expected := `SQL: INSERT INTO "tests" ("password","null_value","placeholder","date","number") VALUES ('<binary>',NULL,'hello there','2017-01-02 00:00:00','1')`
|
||||
|
||||
fakeLog.AssertCount(1)
|
||||
fakeLog.AssertEntryExists(test.Entry{Level: zerolog.DebugLevel, Message: expected})
|
||||
}
|
||||
|
||||
func TestDatabaseLogger_Error(t *testing.T) {
|
||||
db := test.InMemoryDB(t)
|
||||
defer db.Close()
|
||||
db.AutoMigrate(&Test{})
|
||||
|
||||
fakeLog := test.NewLogger(t)
|
||||
defer fakeLog.Dispose()
|
||||
|
||||
// column id doesn't exists
|
||||
db.Model(new(Test)).Where("id = ?", 5).Update("number", 6)
|
||||
|
||||
expectedOne := `SQL: UPDATE "tests" SET "number" = '6' WHERE (id = '5')`
|
||||
expectedTwo := `Database error`
|
||||
|
||||
fakeLog.AssertCount(2)
|
||||
fakeLog.AssertEntryExists(test.Entry{Level: zerolog.DebugLevel, Message: expectedOne})
|
||||
fakeLog.AssertEntryExists(test.Entry{Level: zerolog.ErrorLevel, Message: expectedTwo})
|
||||
}
|
||||
|
||||
func TestDatabaseLogger_EmptyLog(t *testing.T) {
|
||||
fakeLog := test.NewLogger(t)
|
||||
defer fakeLog.Dispose()
|
||||
|
||||
databaseLogger := logger.DatabaseLogger{}
|
||||
databaseLogger.Print([]interface{}{})
|
||||
|
||||
fakeLog.AssertCount(0)
|
||||
}
|
||||
|
||||
func TestDatabaseLogger_UnkownType(t *testing.T) {
|
||||
fakeLog := test.NewLogger(t)
|
||||
defer fakeLog.Dispose()
|
||||
|
||||
databaseLogger := logger.DatabaseLogger{}
|
||||
databaseLogger.Print("abc", "somevalue")
|
||||
|
||||
expected := `DatabaseLogger: cannot handle level "abc"`
|
||||
|
||||
fakeLog.AssertCount(1)
|
||||
fakeLog.AssertEntryExists(test.Entry{Level: zerolog.ErrorLevel, Message: expected})
|
||||
}
|
||||
|
||||
func TestDatabaseLogger_LogWithoutError(t *testing.T) {
|
||||
fakeLog := test.NewLogger(t)
|
||||
defer fakeLog.Dispose()
|
||||
|
||||
databaseLogger := logger.DatabaseLogger{}
|
||||
databaseLogger.Print("log", "somefile", "my log message")
|
||||
|
||||
expected := `my log message`
|
||||
|
||||
fakeLog.AssertCount(1)
|
||||
fakeLog.AssertEntryExists(test.Entry{Level: zerolog.DebugLevel, Message: expected})
|
||||
}
|
||||
50
logger/gql.go
Normal file
50
logger/gql.go
Normal file
@@ -0,0 +1,50 @@
|
||||
package logger
|
||||
|
||||
import (
|
||||
"context"
|
||||
"regexp"
|
||||
"strings"
|
||||
"time"
|
||||
"unicode"
|
||||
|
||||
"github.com/99designs/gqlgen/graphql"
|
||||
"github.com/rs/zerolog/log"
|
||||
)
|
||||
|
||||
var (
|
||||
passRegEx = regexp.MustCompile(`pass\s*:\s*"(?:[^"\\]|\\.)*"`)
|
||||
)
|
||||
|
||||
// GQLLog logs graphql queries, mutations and errors.
|
||||
func GQLLog() graphql.ResponseMiddleware {
|
||||
return func(ctx context.Context, next graphql.ResponseHandler) *graphql.Response {
|
||||
start := time.Now()
|
||||
result := next(ctx)
|
||||
elapsed := time.Now().Sub(start)
|
||||
errs := graphql.GetErrors(ctx)
|
||||
rawQuery := graphql.GetRequestContext(ctx).RawQuery
|
||||
|
||||
if len(errs) > 0 {
|
||||
var errorStrings []string
|
||||
for _, err := range errs {
|
||||
errorStrings = append(errorStrings, err.Error())
|
||||
}
|
||||
|
||||
log.Error().Strs("error", errorStrings).Str("took", elapsed.String()).Msg("GQL: " + toOneLine(hidePassword(rawQuery)))
|
||||
} else if log.Debug().Enabled() {
|
||||
log.Debug().Str("took", elapsed.String()).Msg("GQL: " + toOneLine(hidePassword(rawQuery)))
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
}
|
||||
|
||||
func toOneLine(s string) string {
|
||||
return strings.Join(strings.FieldsFunc(s, func(r rune) bool {
|
||||
return unicode.IsSpace(r) || r == '\n' || r == '\r'
|
||||
}), " ")
|
||||
}
|
||||
|
||||
func hidePassword(s string) string {
|
||||
return passRegEx.ReplaceAllString(s, `pass:"<hidden>"`)
|
||||
}
|
||||
15
logger/logger.go
Normal file
15
logger/logger.go
Normal file
@@ -0,0 +1,15 @@
|
||||
package logger
|
||||
|
||||
import (
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/rs/zerolog"
|
||||
"github.com/rs/zerolog/log"
|
||||
)
|
||||
|
||||
// Init initializes the logger
|
||||
func Init(lvl zerolog.Level) {
|
||||
log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: time.RFC3339}).Level(lvl)
|
||||
log.Debug().Msg("Logger initialized")
|
||||
}
|
||||
14
logger/logger_test.go
Normal file
14
logger/logger_test.go
Normal file
@@ -0,0 +1,14 @@
|
||||
package logger_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/rs/zerolog"
|
||||
"github.com/rs/zerolog/log"
|
||||
"github.com/traggo/server/logger"
|
||||
)
|
||||
|
||||
func TestInit_LoggingWorks(t *testing.T) {
|
||||
logger.Init(zerolog.InfoLevel)
|
||||
log.Info().Msg("test logging")
|
||||
}
|
||||
Reference in New Issue
Block a user