alexvanin/frostfs-http-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-http-gw
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#125] Set object ids in a separate function

Browse source 
Signed-off-by: Denis Kirillov <denis@nspcc.ru>
This commit is contained in:
Denis Kirillov 2022-02-15 12:13:43 +03:00 committed by LeL
parent 2764fabf04
commit 39c29c6d6a
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
downloader/download.go
View file

@ -176,9 +176,8 @@ func (r request) receiveFile(clnt pool.Object, objectAddress *object.Address) {
contentType = val contentType = val
} }
} }
r.Response.Header.Set(hdrObjectID, obj.ID().String())
r.Response.Header.Set(hdrOwnerID, obj.OwnerID().String()) idsToResponse(&r.Response, obj)
r.Response.Header.Set(hdrContainerID, obj.ContainerID().String())
if len(contentType) == 0 { if len(contentType) == 0 {
if readDetector.err != nil { if readDetector.err != nil {

11
downloader/head.go
View file

@ -63,9 +63,8 @@ func (r request) headObject(clnt pool.Object, objectAddress *object.Address) {
contentType = val contentType = val
} }
} }
r.Response.Header.Set(hdrObjectID, obj.ID().String())
r.Response.Header.Set(hdrOwnerID, obj.OwnerID().String()) idsToResponse(&r.Response, obj)
r.Response.Header.Set(hdrContainerID, obj.ContainerID().String())
if len(contentType) == 0 { if len(contentType) == 0 {
objRange := object.NewRange() objRange := object.NewRange()
@ -86,6 +85,12 @@ func (r request) headObject(clnt pool.Object, objectAddress *object.Address) {
r.SetContentType(contentType) r.SetContentType(contentType)
} }
func idsToResponse(resp *fasthttp.Response, obj *object.Object) {
resp.Header.Set(hdrObjectID, obj.ID().String())
resp.Header.Set(hdrOwnerID, obj.OwnerID().String())
resp.Header.Set(hdrContainerID, obj.ContainerID().String())
}
// HeadByAddress handles head requests using simple cid/oid format. // HeadByAddress handles head requests using simple cid/oid format.
func (d *Downloader) HeadByAddress(c *fasthttp.RequestCtx) { func (d *Downloader) HeadByAddress(c *fasthttp.RequestCtx) {
d.byAddress(c, request.headObject) d.byAddress(c, request.headObject)