aboutsummaryrefslogtreecommitdiff
path: root/weed/storage
diff options
context:
space:
mode:
Diffstat (limited to 'weed/storage')
-rw-r--r--weed/storage/needle.go4
-rw-r--r--weed/storage/volume_read_write.go6
2 files changed, 9 insertions, 1 deletions
diff --git a/weed/storage/needle.go b/weed/storage/needle.go
index 39952a3f9..492e4646c 100644
--- a/weed/storage/needle.go
+++ b/weed/storage/needle.go
@@ -258,3 +258,7 @@ func ParseNeedleIdCookie(key_hash_string string) (NeedleId, Cookie, error) {
}
return needleId, cookie, nil
}
+
+func (n *Needle) LastModifiedString() string {
+ return time.Unix(int64(n.LastModified), 0).Format("2006-01-02T15:04:05")
+}
diff --git a/weed/storage/volume_read_write.go b/weed/storage/volume_read_write.go
index dc43c488a..3e36bfb2e 100644
--- a/weed/storage/volume_read_write.go
+++ b/weed/storage/volume_read_write.go
@@ -217,7 +217,11 @@ func ScanVolumeFile(dirname string, collection string, id VolumeId,
glog.V(4).Infof("Adjusting n.Size %d=>0 rest:%d=>%d %+v", oldSize, oldRest, rest, n)
}
}
- if err = visitNeedle(n, offset); err != nil {
+ err = visitNeedle(n, offset)
+ if err == io.EOF {
+ return nil
+ }
+ if err != nil {
glog.V(0).Infof("visit needle error: %v", err)
}
offset += NeedleEntrySize + rest