Skip to content

Commit 31dc4a4

Browse files
authored
Merge pull request #16 from sapcc/rate_limit
Use concrete rate limit error
2 parents 6cad28f + cd16715 commit 31dc4a4

File tree

9 files changed

+34
-15
lines changed

9 files changed

+34
-15
lines changed

pkg/objects/file.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,10 @@ func (f File) uploadNormalObject(body io.Reader, sourceState FileState, hdr swif
213213

214214
util.Log(util.LogError, "PUT %s/%s failed: %s", containerName, objectName, err.Error())
215215

216-
if serr, ok := err.(*swift.Error); ok {
216+
if err == swift.RateLimit {
217217
//upload failed due to rate limit, object is definitely not uploaded
218218
//prevent additional rate limit caused by an unnecessary delete request
219-
if serr.StatusCode == 498 {
220-
return false
221-
}
219+
return false
222220
}
223221

224222
//delete potentially incomplete upload

vendor/github.com/ncw/swift/auth_v3.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ncw/swift/largeobjects.go

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ncw/swift/swift.go

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ncw/swift/swift_internal_test.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ncw/swift/swifttest/server.go

Lines changed: 8 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ncw/swift/timeout_reader.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ncw/swift/watchdog_reader_test.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/pins/github.com_ncw_swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e3042b26a510db220549150362f6733012148d45
1+
067578e41c8dd06bf557d02a92a77bd35e97c05a

0 commit comments

Comments
 (0)