Browse Source

Merge pull request #236 from hxiaodon/master

collection name could be specified in url
pull/239/head
Chris Lu 9 years ago
parent
commit
40f7c5d286
  1. 6
      go/weed/weed_server/filer_server_handlers.go

6
go/weed/weed_server/filer_server_handlers.go

@ -130,7 +130,11 @@ func (fs *FilerServer) PostHandler(w http.ResponseWriter, r *http.Request) {
if replication == "" { if replication == "" {
replication = fs.defaultReplication 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 { if ae != nil {
glog.V(0).Infoln("failing to assign a file id", ae.Error()) glog.V(0).Infoln("failing to assign a file id", ae.Error())
writeJsonError(w, r, http.StatusInternalServerError, ae) writeJsonError(w, r, http.StatusInternalServerError, ae)

Loading…
Cancel
Save