feat (log) add log to adaptors :)

moleculer-go · Apr 3, 2019 · ec198ad · ec198ad
1 parent 01fe869
commit ec198ad
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 9 deletions.
diff --git a/memory_adapter.go b/memory_adapter.go
@@ -9,6 +9,7 @@ import (
 	"github.com/moleculer-go/moleculer"
 	"github.com/moleculer-go/moleculer/payload"
 	"github.com/moleculer-go/moleculer/util"
+	log "github.com/sirupsen/logrus"
 )
 
 //MemoryAdapter stores data in memory!
@@ -17,6 +18,11 @@ type MemoryAdapter struct {
 	SearchFields []string
 	Table        string
 	db           *memdb.MemDB
+	logger       *log.Entry
+}
+
+func (adapter *MemoryAdapter) Init(logger *log.Entry) {
+	adapter.logger = logger
 }
 
 func (adapter *MemoryAdapter) generateSchema() *memdb.DBSchema {

diff --git a/mocks/test_mocks.go b/mocks/test_mocks.go
@@ -4,15 +4,18 @@ import (
 	"github.com/moleculer-go/moleculer"
 	"github.com/moleculer-go/moleculer/payload"
 	. "github.com/onsi/gomega"
+	log "github.com/sirupsen/logrus"
 )
 
 type Adapter interface {
+	Init(*log.Entry)
 	Connect() error
 	Insert(params moleculer.Payload) moleculer.Payload
 	RemoveAll() moleculer.Payload
 }
 
 func ConnectAndLoadUsers(adapter Adapter) (moleculer.Payload, moleculer.Payload, moleculer.Payload) {
+	adapter.Init(log.WithField("test", "adapter"))
 	err := adapter.Connect()
 	if err != nil {
 		panic(err)

diff --git a/moleculer_db.go b/moleculer_db.go
@@ -41,6 +41,7 @@ var defaultSettings = map[string]interface{}{
 }
 
 type Adapter interface {
+	Init(*log.Entry)
 	Connect() error
 	Disconnect() error
 	Find(params moleculer.Payload) moleculer.Payload
@@ -204,18 +205,19 @@ func Mixin(adapter Adapter) moleculer.Mixin {
 			if adapter == nil {
 				settingsAdapter, exists := instance.Settings["db-adapter"]
 				if exists {
-					context.Logger().Debug("db-mixin started. adapter from settings!")
+					context.Logger().Info("db-mixin started - service: ", svc.Name, " -> adapter from settings!")
 					adapter = settingsAdapter.(Adapter)
 				}
 			}
 			if adapter != nil {
-				context.Logger().Info("db-mixin started. adapter.Connect()")
+				context.Logger().Info("db-mixin started - service: ", svc.Name, " -> adapter.Connect()")
+				adapter.Init(context.Logger().WithField("moleculer-db", "adapter"))
 				adapter.Connect()
 			}
 		},
 		Stopped: func(context moleculer.BrokerContext, svc moleculer.Service) {
 			if adapter != nil {
-				context.Logger().Info("db-mixin stopped. adapter.Disconnect()")
+				context.Logger().Info("db-mixin stopped - service: ", svc.Name, " -> adapter.Disconnect()")
 				adapter.Disconnect()
 			}
 		},

diff --git a/moleculer_db_integration_test.go b/moleculer_db_integration_test.go
@@ -1,7 +1,6 @@
 package db_test
 
 import (
-	"fmt"
 	"os"
 	"time"
 
@@ -59,7 +58,6 @@ var _ = Describe("Moleculer DB Integration Tests", func() {
 				"populate": []string{"friends"},
 			})
 			Expect(user.IsError()).Should(BeFalse())
-			fmt.Println("user --> ", user)
 			Expect(user.Get("name").String()).Should(Equal(johnT.Get("name").String()))
 			Expect(user.Get("friends").Exists()).Should(BeTrue())
 			Expect(user.Get("friends").Len()).Should(Equal(2))

diff --git a/moleculer_db_test.go b/moleculer_db_test.go
@@ -26,7 +26,6 @@ var _ = Describe("Moleculer DB Mixin", func() {
 			SearchFields: []string{"name"},
 		}
 
-		//var johnSnow, marie, johnTravolta moleculer.Payload
 		BeforeEach(func() {
 			mocks.ConnectAndLoadUsers(adapter)
 		})

diff --git a/mongo_adapter.go b/mongo_adapter.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/moleculer-go/moleculer/payload"
-
 	"github.com/moleculer-go/moleculer"
+	"github.com/moleculer-go/moleculer/payload"
+	log "github.com/sirupsen/logrus"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
@@ -24,13 +24,19 @@ type MongoAdapter struct {
 	Collection string
 	client     *mongo.Client
 	coll       *mongo.Collection
+	logger     *log.Entry
+}
+
+func (adapter *MongoAdapter) Init(logger *log.Entry) {
+	adapter.logger = logger
 }
 
 // Connect connect to mongo, stores the client and the collection.
 func (adapter *MongoAdapter) Connect() error {
 	if adapter.coll != nil {
 		return nil
 	}
+	adapter.logger.Debug("MongoAdapter Connect() MongoURL: ", adapter.MongoURL)
 	ctx, _ := context.WithTimeout(context.Background(), adapter.Timeout)
 	var err error
 	adapter.client, err = mongo.Connect(ctx, options.Client().ApplyURI(adapter.MongoURL))
@@ -39,12 +45,20 @@ func (adapter *MongoAdapter) Connect() error {
 	}
 	err = adapter.client.Ping(ctx, readpref.Primary())
 	if err != nil {
+		adapter.logger.Error("MongoAdapter Connect() error on ping - error: ", err)
 		return err
 	}
 	adapter.coll = adapter.client.Database(adapter.Database).Collection(adapter.Collection)
+	adapter.logger.Debug("MongoAdapter Connected !")
 	return nil
 }
 
+func (adapter *MongoAdapter) checkConnected() {
+	if adapter.coll == nil {
+		panic("Adapter not connected!")
+	}
+}
+
 // Disconnect disconnects from mongo.
 func (adapter *MongoAdapter) Disconnect() error {
 	ctx, _ := context.WithTimeout(context.Background(), adapter.Timeout)
@@ -146,6 +160,7 @@ func parseFilter(params moleculer.Payload) bson.M {
 }
 
 func (adapter *MongoAdapter) openCursor(params moleculer.Payload) (*mongo.Cursor, context.Context, error) {
+	adapter.checkConnected()
 	ctx, _ := context.WithTimeout(context.Background(), adapter.Timeout)
 	filter := parseFilter(params)
 	opts := parseFindOptions(params)
@@ -234,6 +249,7 @@ func (adapter *MongoAdapter) FindByIds(params moleculer.Payload) moleculer.Paylo
 
 // Count count the number of records for the given filter.
 func (adapter *MongoAdapter) Count(params moleculer.Payload) moleculer.Payload {
+	adapter.checkConnected()
 	ctx, _ := context.WithTimeout(context.Background(), adapter.Timeout)
 	filter := parseFilter(params)
 	count, err := adapter.coll.CountDocuments(ctx, filter)
@@ -244,6 +260,7 @@ func (adapter *MongoAdapter) Count(params moleculer.Payload) moleculer.Payload {
 }
 
 func (adapter *MongoAdapter) Insert(params moleculer.Payload) moleculer.Payload {
+	adapter.checkConnected()
 	ctx, _ := context.WithTimeout(context.Background(), adapter.Timeout)
 	values := params.Bson()
 	res, err := adapter.coll.InsertOne(ctx, values)
@@ -262,6 +279,7 @@ func (adapter *MongoAdapter) Update(params moleculer.Payload) moleculer.Payload
 }
 
 func (adapter *MongoAdapter) UpdateById(id, update moleculer.Payload) moleculer.Payload {
+	adapter.checkConnected()
 	objId, err := primitive.ObjectIDFromHex(id.String())
 	if err != nil {
 		return payload.Error("Cannot update record without id - error: ", err)
@@ -276,6 +294,7 @@ func (adapter *MongoAdapter) UpdateById(id, update moleculer.Payload) moleculer.
 }
 
 func (adapter *MongoAdapter) RemoveById(id moleculer.Payload) moleculer.Payload {
+	adapter.checkConnected()
 	objId, err := primitive.ObjectIDFromHex(id.String())
 	if err != nil {
 		return payload.Error("Cannot update record without id - error: ", err)
@@ -289,6 +308,7 @@ func (adapter *MongoAdapter) RemoveById(id moleculer.Payload) moleculer.Payload
 }
 
 func (adapter *MongoAdapter) RemoveAll() moleculer.Payload {
+	adapter.checkConnected()
 	ctx, _ := context.WithTimeout(context.Background(), adapter.Timeout)
 	res, err := adapter.coll.DeleteMany(ctx, bson.M{})
 	if err != nil {

diff --git a/mongo_adapter_test.go b/mongo_adapter_test.go
@@ -11,18 +11,21 @@ import (
 	"github.com/moleculer-go/moleculer/payload"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	log "github.com/sirupsen/logrus"
 )
 
 var mongoTestsHost = "mongodb://" + os.Getenv("MONGO_TEST_HOST")
 
 func mongoAdapter(database, collection string) *MongoAdapter {
 	fmt.Println("mongoTestsHost: ", mongoTestsHost)
-	return &MongoAdapter{
+	adapter := &MongoAdapter{
 		MongoURL:   mongoTestsHost,
 		Timeout:    2 * time.Second,
 		Database:   database,
 		Collection: collection,
 	}
+	adapter.Init(log.WithField("test", "adapter"))
+	return adapter
 }
 
 type M map[string]interface{}