From 031d9b914ebd748e9998df123429d0534236e9b2 Mon Sep 17 00:00:00 2001 From: Alex Goodman Date: Sat, 16 Mar 2019 11:10:47 -0400 Subject: [PATCH] create log later in processing (closes #177) --- cmd/analyze.go | 2 ++ cmd/build.go | 2 ++ cmd/root.go | 1 - filetree/cache.go | 9 ++++++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cmd/analyze.go b/cmd/analyze.go index 4cf16bb..fe1a839 100644 --- a/cmd/analyze.go +++ b/cmd/analyze.go @@ -30,6 +30,8 @@ func doAnalyzeCmd(cmd *cobra.Command, args []string) { utils.Exit(1) } + initLogging() + runtime.Run(runtime.Options{ ImageId: userImage, ExportFile: exportFile, diff --git a/cmd/build.go b/cmd/build.go index 0e3b014..a29d8a4 100644 --- a/cmd/build.go +++ b/cmd/build.go @@ -22,6 +22,8 @@ func init() { func doBuildCmd(cmd *cobra.Command, args []string) { defer utils.Cleanup() + initLogging() + runtime.Run(runtime.Options{ BuildArgs: args, ExportFile: exportFile, diff --git a/cmd/root.go b/cmd/root.go index b816a16..b501b04 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -40,7 +40,6 @@ func Execute() { func init() { cobra.OnInitialize(initConfig) - cobra.OnInitialize(initLogging) rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.dive.yaml, ~/.config/dive.yaml, or $XDG_CONFIG_HOME/dive.yaml)") rootCmd.PersistentFlags().BoolP("version", "v", false, "display version number") diff --git a/filetree/cache.go b/filetree/cache.go index 0d69380..3dde39a 100644 --- a/filetree/cache.go +++ b/filetree/cache.go @@ -1,5 +1,9 @@ package filetree +import ( + "github.com/sirupsen/logrus" +) + type TreeCacheKey struct { bottomTreeStart, bottomTreeStop, topTreeStart, topTreeStop int } @@ -24,7 +28,10 @@ func (cache *TreeCache) Get(bottomTreeStart, bottomTreeStop, topTreeStart, topTr func (cache *TreeCache) buildTree(key TreeCacheKey) *FileTree { newTree := StackTreeRange(cache.refTrees, key.bottomTreeStart, key.bottomTreeStop) for idx := key.topTreeStart; idx <= key.topTreeStop; idx++ { - newTree.CompareAndMark(cache.refTrees[idx]) + err := newTree.CompareAndMark(cache.refTrees[idx]) + if err != nil { + logrus.Errorf("unable to build tree: %+v", err) + } } return newTree }