gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #236 from hxiaodon/master

Browse Source 
collection name could be specified in url
This commit is contained in:
Chris Lu
2016-01-04 15:15:37 -08:00
parent 6c88abf62f 166cc0d48a
commit 40f7c5d286
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
go/weed/weed_server/filer_server_handlers.go
View File

@@ -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)