Skip to content

Commit

Permalink
Refactoring: change logger library
Browse files Browse the repository at this point in the history
  • Loading branch information
@aopoltorzhicky
aopoltorzhicky committed Dec 7, 2021
1 parent c7b329e commit 65c27aa
Show file tree
Hide file tree
Showing 9 changed files with 119 additions and 104 deletions.
6 changes: 3 additions & 3 deletions database/db.go
View file
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/dipdup-net/go-lib/config"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/rs/zerolog/log"
)

// Database -
Expand All @@ -29,7 +29,7 @@ var (

// Wait -
func Wait(ctx context.Context, db driver.Pinger, checkPeriod time.Duration) {
logrus.Info("Waiting database is up and runnning")
log.Info().Msg("Waiting database is up and runnning")
if err := db.Ping(ctx); err == nil {
return
}
Expand All @@ -41,7 +41,7 @@ func Wait(ctx context.Context, db driver.Pinger, checkPeriod time.Duration) {
return
case <-ticker.C:
if err := db.Ping(ctx); err == nil {
logrus.Warn(err)
log.Warn().Err(err).Msg("")
continue
}
return
Expand Down
21 changes: 10 additions & 11 deletions go.mod
View file
Expand Up @@ -12,19 +12,18 @@ require (
github.com/json-iterator/go v1.1.12
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.11.0
github.com/rs/zerolog v1.26.0
github.com/sergi/go-diff v1.2.0
github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc
github.com/sirupsen/logrus v1.7.0
github.com/shopspring/decimal v1.3.1
github.com/stretchr/testify v1.7.0
github.com/tidwall/gjson v1.9.3
github.com/yhirose/go-peg v0.0.0-20210119023502-a1af152bac31
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/sys v0.0.0-20211031064116-611d5d643895 // indirect
github.com/tidwall/gjson v1.12.1
github.com/yhirose/go-peg v0.0.0-20210804202551-de25d6753cf1
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
golang.org/x/text v0.3.7
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gopkg.in/yaml.v2 v2.4.0
gorm.io/driver/mysql v1.0.5
gorm.io/driver/postgres v1.0.8
gorm.io/driver/sqlite v1.1.4
gorm.io/gorm v1.21.8
gorm.io/driver/mysql v1.2.1
gorm.io/driver/postgres v1.2.3
gorm.io/driver/sqlite v1.2.6
gorm.io/gorm v1.22.4
)
134 changes: 75 additions & 59 deletions go.sum
View file

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions hasura/hasura.go
View file
Expand Up @@ -13,15 +13,15 @@ import (
"github.com/iancoleman/strcase"
"github.com/pkg/errors"

log "github.com/sirupsen/logrus"
"github.com/rs/zerolog/log"
)

const (
allowedQueries = "allowed-queries"
)

func checkHealth(ctx context.Context, api *API) {
log.Info("Waiting hasura is up and running")
log.Info().Msg("Waiting hasura is up and running")
if err := api.Health(ctx); err != nil {
return
}
Expand All @@ -32,7 +32,7 @@ func checkHealth(ctx context.Context, api *API) {
return
case <-ticker.C:
if err := api.Health(ctx); err != nil {
log.Warn(err)
log.Warn().Err(err).Msg("")
continue
}
return
Expand All @@ -54,13 +54,13 @@ func Create(ctx context.Context, hasura *config.Hasura, cfg config.Database, vie
return err
}

log.Info("Fetching existing metadata...")
log.Info().Msg("Fetching existing metadata...")
export, err := api.ExportMetadata(ctx, metadata)
if err != nil {
return err
}

log.Info("Merging metadata...")
log.Info().Msg("Merging metadata...")
tables := make(map[string]struct{})
for i := range metadata.Tables {
tables[metadata.Tables[i].Schema.Name] = struct{}{}
Expand All @@ -76,13 +76,13 @@ func Create(ctx context.Context, hasura *config.Hasura, cfg config.Database, vie
return err
}

log.Info("Replacing metadata...")
log.Info().Msg("Replacing metadata...")
if err := api.ReplaceMetadata(ctx, metadata); err != nil {
return err
}

if len(metadata.QueryCollections) > 0 && (hasura.Rest == nil || *hasura.Rest) {
log.Info("Creating REST endpoints...")
log.Info().Msg("Creating REST endpoints...")
for _, query := range metadata.QueryCollections[0].Definition.Queries {
if err := api.CreateRestEndpoint(ctx, query.Name, query.Name, query.Name, allowedQueries); err != nil {
if e, ok := err.(APIError); !ok || !e.AlreadyExists() {
Expand All @@ -92,15 +92,15 @@ func Create(ctx context.Context, hasura *config.Hasura, cfg config.Database, vie
}
}

log.Info("Tracking views...")
log.Info().Msg("Tracking views...")
for i := range views {
if err := api.TrackTable(ctx, "public", views[i]); err != nil {
if !strings.Contains(err.Error(), "view/table already tracked") {
return err
}
}
if err := api.DropSelectPermissions(ctx, views[i], "user"); err != nil {
log.Warn(err)
log.Warn().Err(err).Msg("")
}
if err := api.CreateSelectPermissions(ctx, views[i], "user", Permission{
Limit: hasura.RowsLimit,
Expand Down
4 changes: 2 additions & 2 deletions node/monitor.go
View file
Expand Up @@ -10,7 +10,7 @@ import (
"time"

"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
"github.com/rs/zerolog/log"
)

const (
Expand Down Expand Up @@ -137,7 +137,7 @@ func (monitor *Monitor) pollingMempool(ctx context.Context, filter string) {
return
default:
if err := monitor.process(ctx, filter, url); err != nil {
log.Error(err)
log.Err(err).Msg("")
continue
}

Expand Down
24 changes: 12 additions & 12 deletions tzkt/events/signalr/hub.go
View file
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/gorilla/websocket"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
"github.com/rs/zerolog/log"
)

var (
Expand Down Expand Up @@ -62,7 +62,7 @@ func (hub *Hub) Connect() error {
}

func (hub *Hub) handshake() error {
log.Tracef("connecting to %s...", hub.url.String())
log.Trace().Msgf("connecting to %s...", hub.url.String())

c, _, err := websocket.DefaultDialer.Dial(hub.url.String(), nil)
if err != nil {
Expand All @@ -82,7 +82,7 @@ func (hub *Hub) handshake() error {
if resp.Error != "" {
return errors.Wrap(ErrHandshake, resp.Error)
}
log.Trace("connected")
log.Trace().Msg("connected")

return nil
}
Expand All @@ -106,16 +106,16 @@ func (hub *Hub) Close() error {
}

func (hub *Hub) reconnect() error {
log.Warn("reconnecting...")
log.Warn().Msg("reconnecting...")

if err := hub.Send(newCloseMessage()); err != nil {
log.Error(err)
log.Err(err).Msg("send")
}

if err := hub.conn.Close(); err != nil {
log.Error(err)
log.Err(err).Msg("close")
}
log.Trace("connection closed")
log.Trace().Msg("connection closed")
if err := hub.handshake(); err != nil {
return err
}
Expand All @@ -140,13 +140,13 @@ func (hub *Hub) listen() {
switch {
case errors.Is(err, ErrTimeout) || websocket.IsCloseError(err, websocket.CloseAbnormalClosure):
if err := hub.reconnect(); err != nil {
log.Errorf("reconnect: %s", err.Error())
log.Warn("retry after 5 seconds")
log.Err(err).Msg("reconnect")
log.Warn().Msg("retry after 5 seconds")
time.Sleep(time.Second * 5)
}
case errors.Is(err, ErrEmptyResponse):
default:
log.Errorf("readAllMessages: %s", err.Error())
log.Err(err).Msg("readAllMessages")
}
}
}
Expand Down Expand Up @@ -198,7 +198,7 @@ func (hub *Hub) readAllMessages() error {
return err
}
if scanner == nil {
log.Warn("No messages during read timeout")
log.Warn().Msg("no messages during read timeout")
return ErrEmptyResponse
}
if err := scanner.Scan(); err != nil {
Expand Down Expand Up @@ -233,7 +233,7 @@ func (hub *Hub) readAllMessages() error {

func (hub *Hub) closeMessageHandler(msg CloseMessage) error {
if msg.Error != "" {
log.Error(msg.Error)
log.Error().Msg(msg.Error)
}
if !msg.AllowReconnect {
return ErrConnectionClose
Expand Down
4 changes: 2 additions & 2 deletions tzkt/events/signalr/json.go
View file
Expand Up @@ -7,7 +7,7 @@ import (

jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
"github.com/rs/zerolog/log"
)

var json = jsoniter.ConfigCompatibleWithStandardLibrary
Expand All @@ -28,7 +28,7 @@ func NewJSONEncoding() *JSONEncoding {

// Decode -
func (e *JSONEncoding) Decode(data []byte) (interface{}, error) {
log.Trace(string(data))
log.Trace().Msg(string(data))

var typ Type
if err := json.Unmarshal(data, &typ); err != nil {
Expand Down
4 changes: 2 additions & 2 deletions tzkt/events/signalr/transport.go
View file
Expand Up @@ -4,7 +4,7 @@ import (
"net/http"
"net/url"

log "github.com/sirupsen/logrus"
"github.com/rs/zerolog/log"

"github.com/pkg/errors"
)
Expand Down Expand Up @@ -41,7 +41,7 @@ func (t *Transport) Negotiate(version Version) (response NegotiateResponse, err
q.Set("negotiateVersion", string(version))
u.RawQuery = q.Encode()

log.WithField("url", u.String()).Trace("Send negotiate request...")
log.Trace().Str("url", u.String()).Msg("send negotiate request...")

req, err := http.NewRequest(http.MethodPost, u.String(), nil)
if err != nil {
Expand Down
8 changes: 4 additions & 4 deletions tzkt/events/tzkt.go
View file
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/dipdup-net/go-lib/tzkt/events/signalr"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
"github.com/rs/zerolog/log"
)

// TzKT - struct that used for connection to TzKT events server
Expand Down Expand Up @@ -141,13 +141,13 @@ func (tzkt *TzKT) listen() {
switch typ := msg.(type) {
case signalr.Invocation:
if len(typ.Arguments) == 0 {
log.Warnf("Empty arguments of invocation: %v", typ)
log.Warn().Msgf("empty arguments of invocation: %v", typ)
continue
}

var packet Packet
if err := json.Unmarshal(typ.Arguments[0], &packet); err != nil {
log.WithError(err).Error("invalid invocation argument")
log.Err(err).Msg("invalid invocation argument")
continue
}

Expand All @@ -160,7 +160,7 @@ func (tzkt *TzKT) listen() {
if packet.Data != nil {
data, err := parseData(typ.Target, packet.Data)
if err != nil {
log.WithError(err).Error("error during parsing data")
log.Err(err).Msg("error during parsing data")
continue
}
message.Body = data
Expand Down

0 comments on commit 65c27aa

Please sign in to comment.