zdam-egzamin-zawodowy
/
backend
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move query logger to the separate package, bump github.com/Kichiyaki/gin-logrus

This commit is contained in:
Dawid Wysokiński 2021-04-23 19:58:14 +02:00
parent f85a21e86f
commit b96d2391ff
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
go.mod
View File

@ -4,7 +4,8 @@ go 1.16
require (
github.com/99designs/gqlgen v0.13.0
github.com/Kichiyaki/gin-logrus v0.0.0-20210423165326-2280b9df9abb
github.com/Kichiyaki/gin-logrus v0.0.0-20210423172928-6bc6120f72fb
github.com/Kichiyaki/go-pg-logrus-query-logger/v10 v10.0.0-20210423175217-c83fa01c60d7 // indirect
github.com/agnivade/levenshtein v1.1.0 // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/gin-contrib/cors v1.3.1

4
go.sum
View File

@ -4,6 +4,10 @@ github.com/99designs/gqlgen v0.13.0/go.mod h1:NV130r6f4tpRWuAI+zsrSdooO/eWUv+Gyy
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/Kichiyaki/gin-logrus v0.0.0-20210423165326-2280b9df9abb h1:Ymsd+3yLK9pI84I7SThDZrG3JdRTYtfIB683TxxMIJc=
github.com/Kichiyaki/gin-logrus v0.0.0-20210423165326-2280b9df9abb/go.mod h1:/6cFnCXbzwvRmVq8deDom0AYaEa8dS05w+/Pn9Eh1YA=
github.com/Kichiyaki/gin-logrus v0.0.0-20210423172928-6bc6120f72fb h1:MRAQUqrDPYsyrU5LdJ5GjUMxdOZJCfTtkPcL6auSBYw=
github.com/Kichiyaki/gin-logrus v0.0.0-20210423172928-6bc6120f72fb/go.mod h1:4YOSjDzO47J1Fh+HZ6/OqdL0wmt1JCevIcTiyruAiYY=
github.com/Kichiyaki/go-pg-logrus-query-logger/v10 v10.0.0-20210423175217-c83fa01c60d7 h1:7IdSzhdupqm4AC3UDH9b5gdCDE2SlX6qkVC0zwqAuLA=
github.com/Kichiyaki/go-pg-logrus-query-logger/v10 v10.0.0-20210423175217-c83fa01c60d7/go.mod h1:ADHVWnGlWcRn1aGthuh7I1Lrn6zzsjkVJju151dXyDw=
github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
github.com/agnivade/levenshtein v1.0.3/go.mod h1:4SFRZbbXWLF4MU1T9Qg0pGgH3Pjs+t6ie5efyrwRJXs=
github.com/agnivade/levenshtein v1.1.0 h1:n6qGwyHG61v3ABce1rPVZklEYRT8NFpCMrpZdBUbYGM=

7
internal/db/db.go
View File

@ -7,6 +7,7 @@ import (
"github.com/sirupsen/logrus"
envutils "github.com/zdam-egzamin-zawodowy/backend/pkg/utils/env"
gopglogrusquerylogger "github.com/Kichiyaki/go-pg-logrus-query-logger/v10"
"github.com/go-pg/pg/v10"
"github.com/go-pg/pg/v10/orm"
"github.com/pkg/errors"
@ -17,7 +18,7 @@ import (
var log = logrus.WithField("package", "internal/db")
type Config struct {
DebugHook bool
LogQueries bool
}
func init() {
@ -28,8 +29,8 @@ func New(cfg *Config) (*pg.DB, error) {
db := pg.Connect(prepareOptions())
if cfg != nil {
if cfg.DebugHook {
db.AddQueryHook(DebugHook{
if cfg.LogQueries {
db.AddQueryHook(gopglogrusquerylogger.QueryLogger{
Entry: log,
})
}

2
main.go
View File

@ -52,7 +52,7 @@ func main() {
})
dbConn, err := db.New(&db.Config{
DebugHook: envutils.GetenvBool("LOG_DB_QUERIES"),
LogQueries: envutils.GetenvBool("LOG_DB_QUERIES"),
})
if err != nil {
logrus.Fatal(errors.Wrap(err, "Error establishing a database connection"))