create grip logger package, allows passing configured logger to subpr…

…ocesses

cmd/kvload/main.go

@@ -9,9 +9,9 @@ import (
 	"github.com/bmeg/grip/gripql"
 	"github.com/bmeg/grip/kvgraph"
 	"github.com/bmeg/grip/kvi"
+	"github.com/bmeg/grip/log"
 	"github.com/bmeg/grip/util"
 	"github.com/paulbellamy/ratecounter"
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -106,7 +106,7 @@ var Cmd = &cobra.Command{
 
 		edgeCounter := ratecounter.NewRateCounter(10 * time.Second)
 		for _, edgeFile := range edgeFileArray {
-			log.Printf("Loading %s", edgeFile)
+			log.Infof("Loading %s", edgeFile)
 			count := 0
 			for e := range util.StreamEdgesFromFile(edgeFile) {
 				graphChan <- &gripql.GraphElement{Graph: graph, Edge: e}

cmd/load/example/main.go

@@ -6,8 +6,8 @@ import (
 	"github.com/bmeg/grip/gripql"
 	"github.com/bmeg/grip/gripql/example"
 
+	"github.com/bmeg/grip/log"
 	"github.com/bmeg/grip/util/rpc"
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 

cmd/load/main.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/bmeg/grip/cmd/load/example"
 	"github.com/bmeg/grip/gripql"
+	"github.com/bmeg/grip/log"
 	"github.com/bmeg/grip/util"
 	"github.com/bmeg/grip/util/rpc"
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -61,7 +61,7 @@ var Cmd = &cobra.Command{
 		wait := make(chan bool)
 		go func() {
 			if err := conn.BulkAdd(elemChan); err != nil {
-				log.Printf("bulk add error: %v", err)
+				log.Errorf("bulk add error: %v", err)
 			}
 			wait <- false
 		}()

cmd/mongoload/main.go

@@ -6,12 +6,12 @@ import (
 	"strings"
 
 	"github.com/bmeg/grip/gripql"
+	"github.com/bmeg/grip/log"
 	"github.com/bmeg/grip/mongo"
 	"github.com/bmeg/grip/util"
 	"github.com/bmeg/grip/util/rpc"
 	"github.com/globalsign/mgo"
 	"github.com/globalsign/mgo/bson"
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 

cmd/rdf/main.go

@@ -7,10 +7,10 @@ import (
 	"strings"
 
 	"github.com/bmeg/grip/gripql"
+	"github.com/bmeg/grip/log"
 	"github.com/bmeg/grip/util/rpc"
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/knakk/rdf"
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 

cmd/server/main.go

@@ -16,13 +16,13 @@ import (
 	_ "github.com/bmeg/grip/kvi/badgerdb" // import so badger will register itself
 	_ "github.com/bmeg/grip/kvi/boltdb"   // import so bolt will register itself
 	_ "github.com/bmeg/grip/kvi/leveldb"  // import so level will register itself
+	"github.com/bmeg/grip/log"
 	"github.com/bmeg/grip/mongo"
 	"github.com/bmeg/grip/psql"
 	"github.com/bmeg/grip/server"
 	_ "github.com/go-sql-driver/mysql" //import so mysql will register as a sql driver
 	"github.com/imdario/mergo"
 	_ "github.com/lib/pq" // import so postgres will register as a sql driver
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -34,7 +34,7 @@ var schemaFile string
 // This opens a database and starts an API server.
 // This blocks indefinitely.
 func Run(conf *config.Config, schemas map[string]*gripql.Graph) error {
-	config.ConfigureLogger(conf.Logger)
+	log.ConfigureLogger(conf.Logger)
 	log.WithFields(log.Fields{"Config": conf}).Info("Starting Server")
 
 	var db gdbi.GraphDB

cmd/stream/main.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/Shopify/sarama"
 	"github.com/bmeg/grip/gripql"
+	"github.com/bmeg/grip/log"
 	"github.com/bmeg/grip/util/rpc"
 	"github.com/golang/protobuf/jsonpb"
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 

config/config.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/bmeg/grip/elastic"
 	esql "github.com/bmeg/grip/existing-sql"
+	"github.com/bmeg/grip/log"
 	"github.com/bmeg/grip/mongo"
 	"github.com/bmeg/grip/psql"
 	"github.com/bmeg/grip/server"
@@ -35,7 +36,7 @@ type Config struct {
 	MongoDB       mongo.Config
 	PSQL          psql.Config
 	ExistingSQL   esql.Config
-	Logger        Logger
+	Logger        log.Logger
 }
 
 // DefaultConfig returns an instance of the default configuration for Grip.
@@ -65,7 +66,7 @@ func DefaultConfig() *Config {
 	c.Elasticsearch.DBName = "gripdb"
 	c.Elasticsearch.BatchSize = 1000
 
-	c.Logger = DefaultLoggerConfig()
+	c.Logger = log.DefaultLoggerConfig()
 	return c
 }
 

elastic/graph.go

@@ -10,10 +10,10 @@ import (
 	"github.com/bmeg/grip/engine/core"
 	"github.com/bmeg/grip/gdbi"
 	"github.com/bmeg/grip/gripql"
+	"github.com/bmeg/grip/log"
 	"github.com/bmeg/grip/timestamp"
 	"github.com/bmeg/grip/util"
 	"github.com/golang/protobuf/jsonpb"
-	log "github.com/sirupsen/logrus"
 	"golang.org/x/sync/errgroup"
 	elastic "gopkg.in/olivere/elastic.v5"
 )

elastic/graphdb.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/bmeg/grip/gdbi"
 	"github.com/bmeg/grip/gripql"
+	"github.com/bmeg/grip/log"
 	"github.com/bmeg/grip/timestamp"
-	log "github.com/sirupsen/logrus"
 	elastic "gopkg.in/olivere/elastic.v5"
 )
 

elastic/index.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/bmeg/grip/gripql"
 	"github.com/bmeg/grip/jsonpath"
+	"github.com/bmeg/grip/log"
 	"github.com/bmeg/grip/protoutil"
-	log "github.com/sirupsen/logrus"
 	elastic "gopkg.in/olivere/elastic.v5"
 )
 

elastic/util.go

@@ -3,7 +3,7 @@ package elastic
 import (
 	"context"
 
-	log "github.com/sirupsen/logrus"
+	"github.com/bmeg/grip/log"
 	elastic "gopkg.in/olivere/elastic.v5"
 )
 

engine/core/processors.go

@@ -13,9 +13,9 @@ import (
 	"github.com/bmeg/grip/jsonpath"
 	"github.com/bmeg/grip/kvi"
 	"github.com/bmeg/grip/kvindex"
+	"github.com/bmeg/grip/log"
 	"github.com/bmeg/grip/protoutil"
 	structpb "github.com/golang/protobuf/ptypes/struct"
-	log "github.com/sirupsen/logrus"
 	"github.com/spenczar/tdigest"
 	"github.com/spf13/cast"
 	"golang.org/x/sync/errgroup"

engine/pipes.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/bmeg/grip/gdbi"
 	"github.com/bmeg/grip/gripql"
+	"github.com/bmeg/grip/log"
 	"github.com/bmeg/grip/protoutil"
-	log "github.com/sirupsen/logrus"
 )
 
 // Start begins processing a query pipeline

existing-sql/graph.go

@@ -9,9 +9,9 @@ import (
 	"github.com/bmeg/grip/engine/core"
 	"github.com/bmeg/grip/gdbi"
 	"github.com/bmeg/grip/gripql"
+	"github.com/bmeg/grip/log"
 	"github.com/bmeg/grip/timestamp"
 	"github.com/jmoiron/sqlx"
-	log "github.com/sirupsen/logrus"
 )
 
 // Graph is the interface to a single graph
@@ -194,7 +194,7 @@ func (g *Graph) VertexLabelScan(ctx context.Context, label string) chan string {
 					data := make(map[string]interface{})
 					if err := rows.MapScan(data); err != nil {
 						log.WithFields(log.Fields{"error": err}).Error("VertexLabelScan: MapScan")
-						log.Println("VertexLabelScan failed:", err)
+						log.Errorln("VertexLabelScan failed:", err)
 						return
 					}
 					v := rowDataToVertex(v, data, types, false)