From 166cc0d48a389be2f6120e3fafda9563309dcf34 Mon Sep 17 00:00:00 2001 From: Xiaodong Huo Date: Mon, 4 Jan 2016 09:52:32 +0800 Subject: [PATCH] collection name could be specified in url uploading file with filer service could specify the collection name in get/post field, if no collection specified, the default collection setting against the filer service will be used --- go/weed/weed_server/filer_server_handlers.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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)