Skip to content

Commit d6b8ba1

Browse files
authored
Merge pull request #364 from YangSen-qn/develop
change up log key and status_code logic
2 parents 05c17e4 + fa327d7 commit d6b8ba1

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

QiniuSDK/Collect/QNReportItem.m

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,7 @@ - (void)reportItem:(QNReportItem *)item token:(NSString *)token{
8383
@implementation QNResponseInfo(Report)
8484

8585
- (NSNumber *)requestReportStatusCode{
86-
if (self.statusCode > -10 && self.statusCode < 0) {
87-
return @(self.statusCode);
88-
} else {
89-
return nil;
90-
}
86+
return @(self.statusCode);
9187
}
9288

9389
- (NSString *)requestReportErrorType{
@@ -135,7 +131,10 @@ - (NSString *)qualityResult{
135131

136132
if (self.statusCode > 199 && self.statusCode < 300) {
137133
result = @"ok";
138-
} else if (self.statusCode > 399 && self.statusCode < 500) {
134+
} else if (self.statusCode > 399 &&
135+
(self.statusCode < 500 || self.statusCode == 573 || self.statusCode == 579 ||
136+
self.statusCode == 608 || self.statusCode == 612 || self.statusCode == 614 || self.statusCode == 630 || self.statusCode == 631 ||
137+
self.statusCode == 701)) {
139138
result = @"bad_request";
140139
} else if (self.statusCode == kQNZeroDataSize){
141140
result = @"zero_size_file";
@@ -172,7 +171,7 @@ - (NSString *)qualityResult{
172171
NSString * const QNReportRequestKeyPort = @"port";
173172
NSString * const QNReportRequestKeyTargetBucket = @"target_bucket";
174173
NSString * const QNReportRequestKeyTargetKey = @"target_key";
175-
NSString * const QNReportRequestKeyTotalElapsedTime = @"total_elaspsed_time";
174+
NSString * const QNReportRequestKeyTotalElapsedTime = @"total_elapsed_time";
176175
NSString * const QNReportRequestKeyDnsElapsedTime = @"dns_elapsed_time";
177176
NSString * const QNReportRequestKeyConnectElapsedTime = @"connect_elapsed_time";
178177
NSString * const QNReportRequestKeyTLSConnectElapsedTime = @"tls_connect_elapsed_time";
@@ -205,7 +204,7 @@ - (NSString *)qualityResult{
205204
NSString *const QNReportBlockKeyUpTime = @"up_time";
206205
NSString * const QNReportBlockKeyTargetRegionId = @"target_region_id";
207206
NSString * const QNReportBlockKeyCurrentRegionId = @"current_region_id";
208-
NSString * const QNReportBlockKeyTotalElapsedTime = @"total_elaspsed_time";
207+
NSString * const QNReportBlockKeyTotalElapsedTime = @"total_elapsed_time";
209208
NSString * const QNReportBlockKeyBytesSent = @"bytes_sent";
210209
NSString * const QNReportBlockKeyRecoveredFrom = @"recovered_from";
211210
NSString * const QNReportBlockKeyFileSize = @"file_size";
@@ -219,7 +218,7 @@ - (NSString *)qualityResult{
219218
NSString * const QNReportQualityKeyLogType = @"log_type";
220219
NSString *const QNReportQualityKeyUpTime = @"up_time";
221220
NSString * const QNReportQualityKeyResult = @"result";
222-
NSString * const QNReportQualityKeyTotalElapsedTime = @"total_elaspsed_time";
221+
NSString * const QNReportQualityKeyTotalElapsedTime = @"total_elapsed_time";
223222
NSString * const QNReportQualityKeyRequestsCount = @"requests_count";
224223
NSString * const QNReportQualityKeyRegionsCount = @"regions_count";
225224
NSString * const QNReportQualityKeyBytesSent = @"bytes_sent";

0 commit comments

Comments
 (0)