diff options
| author | Chris Lu <chris.lu@gmail.com> | 2016-01-04 15:15:37 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2016-01-04 15:15:37 -0800 |
| commit | 40f7c5d2860299696e7737ecbfb3851befafd68e (patch) | |
| tree | abfb5f7f8753b16b4eb81e9dba6c87f1b61ff48a /go | |
| parent | 6c88abf62f9e2a03f782753fc236b790681714e6 (diff) | |
| parent | 166cc0d48a389be2f6120e3fafda9563309dcf34 (diff) | |
| download | seaweedfs-40f7c5d2860299696e7737ecbfb3851befafd68e.tar.xz seaweedfs-40f7c5d2860299696e7737ecbfb3851befafd68e.zip | |
Merge pull request #236 from hxiaodon/master
collection name could be specified in url
Diffstat (limited to 'go')
| -rw-r--r-- | go/weed/weed_server/filer_server_handlers.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/go/weed/weed_server/filer_server_handlers.go b/go/weed/weed_server/filer_server_handlers.go index 1695296d4..e6f1628da 100644 --- a/go/weed/weed_server/filer_server_handlers.go +++ b/go/weed/weed_server/filer_server_handlers.go @@ -130,7 +130,11 @@ func (fs *FilerServer) PostHandler(w http.ResponseWriter, r *http.Request) { if replication == "" { replication = fs.defaultReplication } - assignResult, ae := operation.Assign(fs.master, 1, replication, fs.collection, query.Get("ttl")) + collection := query.Get("collection") + if collection == "" { + collection = fs.collection + } + assignResult, ae := operation.Assign(fs.master, 1, replication, collection, query.Get("ttl")) if ae != nil { glog.V(0).Infoln("failing to assign a file id", ae.Error()) writeJsonError(w, r, http.StatusInternalServerError, ae) |