diff options
| author | Chris Lu <chris.lu@gmail.com> | 2013-07-10 00:25:14 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2013-07-10 00:25:14 -0700 |
| commit | 4c200acd7dd663bed5f566c5538114ef66e5cbe3 (patch) | |
| tree | 7c186175c22a45d8346ce02ad6fb61766e2876c3 /go/weed/upload.go | |
| parent | 53b6831f73ffcf4dcb6cbf6fdff0d7e60389745c (diff) | |
| download | seaweedfs-4c200acd7dd663bed5f566c5538114ef66e5cbe3.tar.xz seaweedfs-4c200acd7dd663bed5f566c5538114ef66e5cbe3.zip | |
1. ensure replicated file has the same timestamp
2. upload can specify modified time by &ts=...
3. correctly return code 304
Diffstat (limited to 'go/weed/upload.go')
| -rw-r--r-- | go/weed/upload.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/go/weed/upload.go b/go/weed/upload.go index a47551ddf..96b326a39 100644 --- a/go/weed/upload.go +++ b/go/weed/upload.go @@ -66,7 +66,12 @@ func upload(filename string, server string, fid string) (int, error) { debug("Failed to open file:", filename) return 0, err } - ret, e := operation.Upload("http://"+server+"/"+fid, path.Base(filename), fh) + fi, fiErr := fh.Stat() + if fiErr!=nil { + debug("Failed to stat file:", filename) + return 0, fiErr + } + ret, e := operation.Upload("http://"+server+"/"+fid+"?ts="+strconv.Itoa(int(fi.ModTime().Unix()) ), path.Base(filename), fh) if e != nil { return 0, e } |