From 940d88b6955bf798d5e901e91557d5233bbad058 Mon Sep 17 00:00:00 2001 From: nguyenhuuluan434 Date: Thu, 27 Jun 2019 10:17:42 +0700 Subject: [PATCH] refactor code --- backend/swift/swift.go | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/backend/swift/swift.go b/backend/swift/swift.go index 0220b730c..f9bcc9dd8 100644 --- a/backend/swift/swift.go +++ b/backend/swift/swift.go @@ -1155,16 +1155,8 @@ func (o *Object) updateChunks(in0 io.Reader, headers swift.Headers, size int64, return shouldRetryHeaders(rxHeaders, err) }) if err != nil { - if len(segmentInfos) > 0 { - for _, v := range segmentInfos { - fs.Debugf(o, "Delete segment file %q on %q", v, o.fs.segmentsContainer) - e := o.fs.c.ObjectDelete(o.fs.segmentsContainer, v) - if e != nil { - fs.Errorf(o, "Error occured in delete segment file %q on %q , error: %q", v, o.fs.segmentsContainer, e) - } - } - segmentInfos = nil - } + deleteChunks(o, segmentInfos) + segmentInfos = nil return "", err } i++ @@ -1180,20 +1172,24 @@ func (o *Object) updateChunks(in0 io.Reader, headers swift.Headers, size int64, return shouldRetryHeaders(rxHeaders, err) }) if err != nil { - if segmentInfos != nil && len(segmentInfos) > 0 { - for _, v := range segmentInfos { - fs.Debugf(o, "Delete segment file %q on %q", v, o.fs.segmentsContainer) - e := o.fs.c.ObjectDelete(o.fs.segmentsContainer, v) - if e != nil { - fs.Errorf(o, "Error occured in delete segment file %q on %q , error: %q", v, o.fs.segmentsContainer, e) - } - } - segmentInfos = nil - } + deleteChunks(o, segmentInfos) + segmentInfos = nil } return uniquePrefix + "/", err } +func deleteChunks(o *Object, segmentInfos []string) { + if segmentInfos != nil && len(segmentInfos) > 0 { + for _, v := range segmentInfos { + fs.Debugf(o, "Delete segment file %q on %q", v, o.fs.segmentsContainer) + e := o.fs.c.ObjectDelete(o.fs.segmentsContainer, v) + if e != nil { + fs.Errorf(o, "Error occured in delete segment file %q on %q , error: %q", v, o.fs.segmentsContainer, e) + } + } + } +} + // Update the object with the contents of the io.Reader, modTime and size // // The new object may have been created if an error is returned