From eaecdf4345e5a11ba2f739fb76fd55234e590deb Mon Sep 17 00:00:00 2001 From: frranck Date: Mon, 1 Jun 2015 11:48:27 +0200 Subject: [PATCH 1/6] Update AFHTTPRequestOperationManager+AutoRetry.m --- AFHTTPRequestOperationManager+AutoRetry.m | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/AFHTTPRequestOperationManager+AutoRetry.m b/AFHTTPRequestOperationManager+AutoRetry.m index a0c96ad..359f6bd 100644 --- a/AFHTTPRequestOperationManager+AutoRetry.m +++ b/AFHTTPRequestOperationManager+AutoRetry.m @@ -59,6 +59,15 @@ - (AFHTTPRequestOperation *)HTTPRequestOperationWithRequest:(NSURLRequest *)requ [self.operationQueue addOperation:retryOperation]; }; RetryDelayCalcBlock delayCalc = self.retryDelayCalcBlock; + + if ([request isKindOfClass:[NSMutableURLRequest class]]) { + NSMutableURLRequest * request2=(NSMutableURLRequest * ) request; + request2.timeoutInterval=request2.timeoutInterval*1.5; + NSLog(@"AutoRetry: increasing time to %f seconds...", request2.timeoutInterval); + } else { + NSLog(@"AutoRetry: not increasing timeout"); + } + int intervalToWait = delayCalc(originalRetryCount, retriesRemainingCount, intervalInSeconds); if (intervalToWait > 0) { NSLog(@"AutoRetry: Delaying retry for %d seconds...", intervalToWait); @@ -227,4 +236,4 @@ - (AFHTTPRequestOperation *)DELETE:(NSString *)URLString @end -#pragma clang diagnostic pop \ No newline at end of file +#pragma clang diagnostic pop From 830e50cfb84e34f200c6ce6b25d4c356093de65d Mon Sep 17 00:00:00 2001 From: frranck Date: Fri, 3 Jul 2015 08:55:38 +0200 Subject: [PATCH 2/6] Update AFHTTPRequestOperationManager+AutoRetry.m --- AFHTTPRequestOperationManager+AutoRetry.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AFHTTPRequestOperationManager+AutoRetry.m b/AFHTTPRequestOperationManager+AutoRetry.m index 359f6bd..d73e5d0 100644 --- a/AFHTTPRequestOperationManager+AutoRetry.m +++ b/AFHTTPRequestOperationManager+AutoRetry.m @@ -61,9 +61,9 @@ - (AFHTTPRequestOperation *)HTTPRequestOperationWithRequest:(NSURLRequest *)requ RetryDelayCalcBlock delayCalc = self.retryDelayCalcBlock; if ([request isKindOfClass:[NSMutableURLRequest class]]) { - NSMutableURLRequest * request2=(NSMutableURLRequest * ) request; - request2.timeoutInterval=request2.timeoutInterval*1.5; - NSLog(@"AutoRetry: increasing time to %f seconds...", request2.timeoutInterval); + // NSMutableURLRequest * request2=(NSMutableURLRequest * ) request; + request.timeoutInterval=request.timeoutInterval*1.5; + NSLog(@"AutoRetry: increasing time to %f seconds...", request.timeoutInterval); } else { NSLog(@"AutoRetry: not increasing timeout"); } From 9ca2b5a0a9bc5021ef5b6be4fa4ef84b2b8ae77b Mon Sep 17 00:00:00 2001 From: frranck Date: Fri, 3 Jul 2015 08:58:38 +0200 Subject: [PATCH 3/6] Update AFHTTPRequestOperationManager+AutoRetry.m --- AFHTTPRequestOperationManager+AutoRetry.m | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/AFHTTPRequestOperationManager+AutoRetry.m b/AFHTTPRequestOperationManager+AutoRetry.m index d73e5d0..d990e6c 100644 --- a/AFHTTPRequestOperationManager+AutoRetry.m +++ b/AFHTTPRequestOperationManager+AutoRetry.m @@ -38,7 +38,7 @@ - (id)operationsDict { return self.__operationsDict; } -- (AFHTTPRequestOperation *)HTTPRequestOperationWithRequest:(NSURLRequest *)request +- (AFHTTPRequestOperation *)HTTPRequestOperationWithRequest:(NSMutableURLRequest *)request success:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure autoRetryOf:(int)retriesRemaining retryInterval:(int)intervalInSeconds { @@ -61,8 +61,7 @@ - (AFHTTPRequestOperation *)HTTPRequestOperationWithRequest:(NSURLRequest *)requ RetryDelayCalcBlock delayCalc = self.retryDelayCalcBlock; if ([request isKindOfClass:[NSMutableURLRequest class]]) { - // NSMutableURLRequest * request2=(NSMutableURLRequest * ) request; - request.timeoutInterval=request.timeoutInterval*1.5; + request.timeoutInterval=request.timeoutInterval*INCREASE_TIMEOUT_RATIO; NSLog(@"AutoRetry: increasing time to %f seconds...", request.timeoutInterval); } else { NSLog(@"AutoRetry: not increasing timeout"); From 9dbf73288c74445751da1e61f06a0921b70f58b1 Mon Sep 17 00:00:00 2001 From: frranck Date: Fri, 3 Jul 2015 08:59:23 +0200 Subject: [PATCH 4/6] Update AFHTTPRequestOperationManager+AutoRetry.h --- AFHTTPRequestOperationManager+AutoRetry.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AFHTTPRequestOperationManager+AutoRetry.h b/AFHTTPRequestOperationManager+AutoRetry.h index 7d2f87c..a5a0beb 100644 --- a/AFHTTPRequestOperationManager+AutoRetry.h +++ b/AFHTTPRequestOperationManager+AutoRetry.h @@ -11,7 +11,7 @@ typedef int (^RetryDelayCalcBlock)(int, int, int); // int totalRetriesAllowed, i @interface AFHTTPRequestOperationManager (AutoRetry) -- (AFHTTPRequestOperation *)HTTPRequestOperationWithRequest:(NSURLRequest *)request +- (AFHTTPRequestOperation *)HTTPRequestOperationWithRequest:(NSMutableURLRequest *)request success:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success failure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure autoRetryOf:(int)retriesRemaining @@ -115,4 +115,4 @@ typedef int (^RetryDelayCalcBlock)(int, int, int); // int totalRetriesAllowed, i @end -#pragma clang diagnostic pop \ No newline at end of file +#pragma clang diagnostic pop From 4f0dee43c7600a4beb084430c4114d986191af49 Mon Sep 17 00:00:00 2001 From: frranck Date: Fri, 3 Jul 2015 09:00:09 +0200 Subject: [PATCH 5/6] Update AFHTTPRequestOperationManager+AutoRetry.h --- AFHTTPRequestOperationManager+AutoRetry.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AFHTTPRequestOperationManager+AutoRetry.h b/AFHTTPRequestOperationManager+AutoRetry.h index a5a0beb..3a304ad 100644 --- a/AFHTTPRequestOperationManager+AutoRetry.h +++ b/AFHTTPRequestOperationManager+AutoRetry.h @@ -7,6 +7,8 @@ #pragma clang diagnostic push #pragma ide diagnostic ignored "OCUnusedMethodInspection" +#define INCREASE_TIMEOUT_RATIO 1.5 + typedef int (^RetryDelayCalcBlock)(int, int, int); // int totalRetriesAllowed, int retriesRemaining, int delayBetweenIntervalsModifier @interface AFHTTPRequestOperationManager (AutoRetry) From 96a7fcd3bd06570c1251012019a98daf53d01245 Mon Sep 17 00:00:00 2001 From: frranck Date: Thu, 9 Jul 2015 16:53:49 +0200 Subject: [PATCH 6/6] Update AFHTTPRequestOperationManager+AutoRetry.m --- AFHTTPRequestOperationManager+AutoRetry.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AFHTTPRequestOperationManager+AutoRetry.m b/AFHTTPRequestOperationManager+AutoRetry.m index d990e6c..4366c92 100644 --- a/AFHTTPRequestOperationManager+AutoRetry.m +++ b/AFHTTPRequestOperationManager+AutoRetry.m @@ -78,7 +78,7 @@ - (AFHTTPRequestOperation *)HTTPRequestOperationWithRequest:(NSMutableURLRequest addRetryOperation(); } } else { - NSLog(@"AutoRetry: Request failed %d times: %@", originalRetryCount, error.localizedDescription); + NSLog(@"AutoRetry: Request %@ failed %d times: %@",request, originalRetryCount, error.localizedDescription); NSLog(@"AutoRetry: No more retries allowed! executing supplied failure block..."); failure(operation, error); NSLog(@"AutoRetry: done.");