diff options
| author | Chris Lu <chris.lu@gmail.com> | 2015-02-07 15:35:28 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2015-02-07 15:35:28 -0800 |
| commit | f7998f86522ef04717e22bb094f00138bdf18748 (patch) | |
| tree | 5d8454179564d52feae0ad78caa2648518f63eb8 /go/operation/delete_content.go | |
| parent | 714ccb6e2b709355bed617947ccaa6ad4b68b77b (diff) | |
| download | seaweedfs-f7998f86522ef04717e22bb094f00138bdf18748.tar.xz seaweedfs-f7998f86522ef04717e22bb094f00138bdf18748.zip | |
merge conflicts
Diffstat (limited to 'go/operation/delete_content.go')
| -rw-r--r-- | go/operation/delete_content.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/go/operation/delete_content.go b/go/operation/delete_content.go index 064cc8df9..afd1bbc34 100644 --- a/go/operation/delete_content.go +++ b/go/operation/delete_content.go @@ -7,6 +7,7 @@ import ( "strings" "sync" + "github.com/chrislusf/weed-fs/go/security" "github.com/chrislusf/weed-fs/go/util" ) @@ -16,12 +17,12 @@ type DeleteResult struct { Error string `json:"error,omitempty"` } -func DeleteFile(master string, fileId string) error { +func DeleteFile(master string, fileId string, jwt security.EncodedJwt) error { fileUrl, err := LookupFileId(master, fileId) if err != nil { return err } - return util.Delete(fileUrl) + return util.Delete(fileUrl, jwt) } func ParseFileId(fid string) (vid string, key_cookie string, err error) { |