From 5f6b0205da255f4e720b6ebf895e039d92e5843c Mon Sep 17 00:00:00 2001 From: Elara Musayelyan Date: Sun, 16 Oct 2022 12:39:42 -0700 Subject: [PATCH] Add debug logging to resource loading --- resources.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/resources.go b/resources.go index 92e9ddb..4eb7307 100644 --- a/resources.go +++ b/resources.go @@ -77,12 +77,16 @@ func LoadResources(file *os.File, fs *blefs.FS) (<-chan ResourceLoadProgress, er return nil, err } + log.Debug().Msg("Decoded manifest file") + go func() { defer close(out) for _, file := range manifest.Obsolete { name := filepath.Base(file.Path) + log.Debug().Str("file", file.Path).Msg("Removing file") + err := fs.RemoveAll(file.Path) if err != nil { out <- ResourceLoadProgress{ @@ -93,6 +97,8 @@ func LoadResources(file *os.File, fs *blefs.FS) (<-chan ResourceLoadProgress, er return } + log.Debug().Str("file", file.Path).Msg("Removed file") + out <- ResourceLoadProgress{ Name: name, Operation: ResourceOperationRemoveObsolete, @@ -121,8 +127,11 @@ func LoadResources(file *os.File, fs *blefs.FS) (<-chan ResourceLoadProgress, er return } + log.Debug().Str("file", file.Path).Msg("Making directories") + err = fs.MkdirAll(filepath.Dir(file.Path)) if err != nil { + log.Debug().Err(err).Msg("Error making directories") out <- ResourceLoadProgress{ Name: file.Name, Operation: ResourceOperationUpload, @@ -132,8 +141,14 @@ func LoadResources(file *os.File, fs *blefs.FS) (<-chan ResourceLoadProgress, er return } + log.Debug(). + Str("file", file.Path). + Int64("size", srcFi.Size()). + Msg("Creating file") + dst, err := fs.Create(file.Path, uint32(srcFi.Size())) if err != nil { + log.Debug().Err(err).Msg("Error creating file") out <- ResourceLoadProgress{ Name: file.Name, Operation: ResourceOperationUpload, @@ -146,6 +161,11 @@ func LoadResources(file *os.File, fs *blefs.FS) (<-chan ResourceLoadProgress, er progCh := dst.Progress() go func() { for sent := range progCh { + log.Debug(). + Int64("total", srcFi.Size()). + Uint32("sent", sent). + Msg("Progress event sent") + out <- ResourceLoadProgress{ Name: file.Name, Operation: ResourceOperationUpload, @@ -161,6 +181,7 @@ func LoadResources(file *os.File, fs *blefs.FS) (<-chan ResourceLoadProgress, er n, err := io.Copy(dst, src) if err != nil { + log.Debug().Err(err).Msg("Error writing to file") out <- ResourceLoadProgress{ Name: file.Name, Operation: ResourceOperationUpload,