Browse Source

refactoring

pull/357/head
Chris Lu 9 years ago
parent
commit
576573711a
  1. 17
      weed/storage/volume.go
  2. 18
      weed/storage/volume_loading.go

17
weed/storage/volume.go

@ -299,23 +299,6 @@ func (v *Volume) ContentSize() uint64 {
return v.nm.ContentSize()
}
func checkFile(filename string) (exists, canRead, canWrite bool, modTime time.Time) {
exists = true
fi, err := os.Stat(filename)
if os.IsNotExist(err) {
exists = false
return
}
if fi.Mode()&0400 != 0 {
canRead = true
}
if fi.Mode()&0200 != 0 {
canWrite = true
}
modTime = fi.ModTime()
return
}
// volume is expired if modified time + volume ttl < now
// except when volume is empty
// or when the volume does not have a ttl

18
weed/storage/volume_loading.go

@ -3,6 +3,7 @@ package storage
import (
"fmt"
"os"
"time"
"github.com/chrislusf/seaweedfs/weed/glog"
)
@ -87,3 +88,20 @@ func (v *Volume) load(alsoLoadIndex bool, createDatIfMissing bool, needleMapKind
}
return e
}
func checkFile(filename string) (exists, canRead, canWrite bool, modTime time.Time) {
exists = true
fi, err := os.Stat(filename)
if os.IsNotExist(err) {
exists = false
return
}
if fi.Mode()&0400 != 0 {
canRead = true
}
if fi.Mode()&0200 != 0 {
canWrite = true
}
modTime = fi.ModTime()
return
}
Loading…
Cancel
Save