diff options
| author | shibinbin <shibinbin@megvii.com> | 2020-06-11 11:14:31 +0800 |
|---|---|---|
| committer | shibinbin <shibinbin@megvii.com> | 2020-06-11 11:14:31 +0800 |
| commit | 29a4c3944eeb07434060df52dfb1d3cf4c59dc91 (patch) | |
| tree | 45dd99cb3b58571372053ff79597259b707f6259 /weed/util | |
| parent | 40334bc28d3fa694ce59b4e65077efb845264d20 (diff) | |
| parent | b9365de47b04414e704cb62a3cfa9753e8c5ec0c (diff) | |
| download | seaweedfs-29a4c3944eeb07434060df52dfb1d3cf4c59dc91.tar.xz seaweedfs-29a4c3944eeb07434060df52dfb1d3cf4c59dc91.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'weed/util')
| -rw-r--r-- | weed/util/constants.go | 6 | ||||
| -rw-r--r-- | weed/util/file_util.go | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/weed/util/constants.go b/weed/util/constants.go index 7c3927a66..6e9b83a0b 100644 --- a/weed/util/constants.go +++ b/weed/util/constants.go @@ -5,10 +5,10 @@ import ( ) var ( - VERSION = fmt.Sprintf("%s %d.%d", sizeLimit, 1, 79) - COMMIT = "" + VERSION = fmt.Sprintf("%s %d.%d", sizeLimit, 1, 81) + COMMIT = "" ) func Version() string { return VERSION + " " + COMMIT -}
\ No newline at end of file +} diff --git a/weed/util/file_util.go b/weed/util/file_util.go index bef9f7cd6..ff725830b 100644 --- a/weed/util/file_util.go +++ b/weed/util/file_util.go @@ -49,6 +49,10 @@ func CheckFile(filename string) (exists, canRead, canWrite bool, modTime time.Ti exists = false return } + if err != nil { + glog.Errorf("check %s: %v", filename, err) + return + } if fi.Mode()&0400 != 0 { canRead = true } |