pass logrus logger to badger

bmeg · Sep 24, 2019 · 02c2fb7 · 02c2fb7
1 parent d0440f1
commit 02c2fb7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/cmd/kvload/main.go b/cmd/kvload/main.go
@@ -44,6 +44,7 @@ var Cmd = &cobra.Command{
 			return err
 		}
 		db := kvgraph.NewKVGraph(kv)
+		defer db.Close()
 
 		_ = db.AddGraph(graph)
 		kgraph, err := db.Graph(graph)
@@ -83,7 +84,7 @@ var Cmd = &cobra.Command{
 		go func() {
 			wg.Add(1)
 			if err := kgraph.BulkAdd(graphChan); err != nil {
-				log.Error(err)
+				log.Errorf("BulkdAdd: %v", err)
 			}
 			wg.Done()
 		}()
@@ -100,6 +101,7 @@ var Cmd = &cobra.Command{
 					log.Infof("Loaded %d vertices (%d/sec)", count, vertexCounter.Rate()/10)
 				}
 			}
+			log.Infof("Loaded %d vertices (%d/sec)", count, vertexCounter.Rate()/10)
 		}
 
 		edgeCounter := ratecounter.NewRateCounter(10 * time.Second)
@@ -114,10 +116,11 @@ var Cmd = &cobra.Command{
 					log.Infof("Loaded %d edges (%d/sec)", count, edgeCounter.Rate()/10)
 				}
 			}
+			log.Infof("Loaded %d edges (%d/sec)", count, edgeCounter.Rate()/10)
 		}
+
 		close(graphChan)
 		wg.Wait()
-		db.Close()
 		return nil
 	},
 }

diff --git a/kvi/badgerdb/badger_store.go b/kvi/badgerdb/badger_store.go
@@ -29,11 +29,15 @@ func NewKVInterface(path string, kopts kvi.Options) (kvi.KVInterface, error) {
 		}
 	}
 
+	blog := log.New()
+	blog.SetLevel(log.WarnLevel)
+
 	opts := badger.Options{}
 	opts = badger.DefaultOptions(path)
 	opts.TableLoadingMode = options.MemoryMap
 	opts.Dir = path
 	opts.ValueDir = path
+	opts.Logger = blog
 	db, err := badger.Open(opts)
 	if err != nil {
 		return nil, err