From 52b8f44d6cb23308965ea4595547307c299429fc Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Tue, 15 Sep 2020 15:47:01 +0200 Subject: [PATCH] RDBMS cleanup, init logger in store tests --- store/mysql/mysql.go | 2 -- store/rdbms/rdbms.go | 6 +++++- store/tests/main_test.go | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/store/mysql/mysql.go b/store/mysql/mysql.go index 03f151c42..b2eff5bc5 100644 --- a/store/mysql/mysql.go +++ b/store/mysql/mysql.go @@ -56,8 +56,6 @@ func (s *Store) Upgrade(ctx context.Context, log *zap.Logger) (err error) { return (&rdbms.Schema{}).Upgrade(ctx, NewUpgrader(log, s)) } -//func (s *Store) Crea - // ProcDataSourceName validates given DSN and ensures // params are present and correct // diff --git a/store/rdbms/rdbms.go b/store/rdbms/rdbms.go index ea6c4c4e4..e48ad17b9 100644 --- a/store/rdbms/rdbms.go +++ b/store/rdbms/rdbms.go @@ -168,7 +168,11 @@ func (s Store) tryToConnect(ctx context.Context, db *sqlx.DB) error { } } - s.log(ctx).Debug("connected to the database") + s.log(ctx). + // Make a small adjustment when + // collecting callers from the callstack for this + WithOptions(zap.AddCallerSkip(-2)). + Debug("connected to the database") break } diff --git a/store/tests/main_test.go b/store/tests/main_test.go index 082d0a8ec..1df187aa5 100644 --- a/store/tests/main_test.go +++ b/store/tests/main_test.go @@ -2,6 +2,7 @@ package tests import ( "context" + "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/store" "github.com/cortezaproject/corteza-server/store/mysql" "github.com/cortezaproject/corteza-server/store/postgres" @@ -38,6 +39,8 @@ func Test_Store(t *testing.T) { } ) + logger.Init() + var ( ctx = context.Background() @@ -88,8 +91,6 @@ func Test_Store(t *testing.T) { return } - t.Logf("connecting to %s with %s", s.name, dsn) - genericStore, err := s.init(ctx, dsn) if err != nil { t.Errorf("failed to initialize %s store: %s", s.name, err.Error())