ston1th/cachefs
0
0
Fork 0
Code Issues Releases Activity

removed debug logging

Browse source
This commit is contained in:
ston1th 2022-03-19 15:49:04 +01:00
commit 10512e5738
3 changed files with 36 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

70
pkg/fs/fs.go
View file

@ -111,13 +111,11 @@ func (fs *FS) Stat(name string) (fi stdfs.FileInfo, err error) {
func (fs *FS) StatWithOffline(name string) (fi stdfs.FileInfo, offline bool, err error) {
sp, dp := fs.paths(name)
fi, err = os.Stat(sp)
if errors.Is(err, os.ErrNotExist) {
fi, err = os.Stat(dp)
if err != nil {
return
}
offline = true
if err == nil {
return
}
fi, err = os.Stat(dp)
offline = true
return
}
@ -171,47 +169,51 @@ func (fs *FS) paths(name string) (sp string, dp string) {
return
}
func (fs *FS) open(name, sp, dp string) (f *os.File, fi os.FileInfo, offline bool, err error) {
f, err = os.Open(sp)
if err == nil {
fi, err = f.Stat()
if err == nil {
return
}
f.Close()
}
f, err = os.Open(dp)
if err != nil {
return
}
fi, err = f.Stat()
if err != nil {
f.Close()
}
offline = true
return
}
func (fs *FS) Open(name string) (f http.File, err error) {
log := fs.log.WithValues("file", name)
sp, dp := fs.paths(name)
offline := false
sf, err := os.Open(sp)
file, fi, offline, err := fs.open(name, sp, dp)
if err != nil {
if errors.Is(err, os.ErrNotExist) {
sf, err = os.Open(dp)
if err != nil {
if !skipLog(name) {
log.Error(err, "error opening source file")
}
return
}
offline = true
log.V(2).Info("file offline mode", "path", dp)
} else {
if !skipLog(name) {
log.Error(err, "error opening source file")
return
}
}
sfi, err := sf.Stat()
if err != nil {
sf.Close()
log.Error(err, "error stat source file")
return
}
if sfi.IsDir() {
if empty, e := dirEmpty(sf.Name()); empty && e == nil {
sf.Close()
sf, err = os.Open(dp)
offline = true
if fi.IsDir() {
if offline {
log.V(2).Info("dir offline mode", "path", dp)
}
f = &Dir{log: log.WithName("dir"), f: sf, dc: fs.dc}
f = &Dir{log: log.WithName("dir"), f: file, dc: fs.dc}
return
}
md := fs.metadata(name, sfi.Size())
if offline {
log.V(2).Info("file offline mode", "path", dp)
}
md := fs.metadata(name, fi.Size())
f = &File{
log: log,
f: sf,
f: file,
md: md,
offline: offline,
}
@ -256,9 +258,7 @@ func (fs *FS) openCacheFile(name string, size int64) (df *os.File, err error) {
func (fs *FS) metadata(name string, size int64) (md *Metadata) {
fs.mu.Lock()
fs.log.Info("fs.mu.Lock()")
defer fs.mu.Unlock()
defer fs.log.Info("fs.mu.Unlock()")
if md, ok := fs.md[name]; ok {
if size > 0 && md.Size != size {
log := fs.log.WithValues("file", name)