Skip to content

Commit 7970156

Browse files
authored
Log response codes for CDN errors
1 parent c7c60be commit 7970156

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

SignalServiceKit/Upload/UploadEndpointCDN2.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ struct UploadEndpointCDN2: UploadEndpoint {
211211
throw error
212212
case let error as OWSHTTPError where (500...599).contains(error.responseStatusCode):
213213
// On 5XX errors, clients should try to resume the upload
214-
attempt.logger.warn("Temporary upload failure, retry.")
214+
attempt.logger.warn("Temporary upload failure [\(error.responseStatusCode)], retry.")
215215
// Check for any progress here
216216
throw Upload.Error.uploadFailure(recovery: .resume(retryMode))
217217
case OWSHTTPError.networkFailure(let wrappedError):

SignalServiceKit/Upload/UploadEndpointCDN3.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,15 @@ struct UploadEndpointCDN3: UploadEndpoint {
173173
switch error {
174174
case let error where error.httpStatusCode == 415:
175175
// 415 is a checksum error, log the error and retry
176-
attempt.logger.warn("Upload checksum validation failed, retry.\(debugInfo)")
176+
attempt.logger.warn("Upload checksum validation failed [415], retry.\(debugInfo)")
177177
throw Upload.Error.uploadFailure(recovery: .restart(retryMode))
178178
case let error where (400...499).contains(error.responseStatusCode):
179179
// On 4XX errors, clients should restart the upload
180-
attempt.logger.warn("Unexpected upload failure, restart.\(debugInfo)")
180+
attempt.logger.warn("Unexpected upload failure [\(error.responseStatusCode)], restart.\(debugInfo)")
181181
throw Upload.Error.uploadFailure(recovery: .restart(retryMode))
182182
case let error where (500...599).contains(error.responseStatusCode):
183183
// On 5XX errors, clients should try to resume the upload
184-
attempt.logger.warn("Temporary upload failure, retry.\(debugInfo)")
184+
attempt.logger.warn("Temporary upload failure [\(error.responseStatusCode)], retry.\(debugInfo)")
185185
throw Upload.Error.uploadFailure(recovery: .resume(retryMode))
186186
case .networkFailure(let wrappedError):
187187
let debugMessage = DebugFlags.internalLogging ? " Error: \(wrappedError.debugDescription)" : ""
@@ -193,7 +193,7 @@ struct UploadEndpointCDN3: UploadEndpoint {
193193
throw Upload.Error.networkError
194194
}
195195
default:
196-
attempt.logger.warn("Unknown upload failure. (HTTP status code: \(error.responseStatusCode)) \(debugInfo)")
196+
attempt.logger.warn("Unknown upload failure. [\(error.responseStatusCode)] \(debugInfo)")
197197
throw Upload.Error.unknown
198198
}
199199
} catch _ as CancellationError {

0 commit comments

Comments
 (0)