Skip to content

Commit a1b8be9

Browse files
committed
Merge from remote into local.
2 parents f6c59dc + 2517aae commit a1b8be9

File tree

3 files changed

+41
-2
lines changed

3 files changed

+41
-2
lines changed

STNetTaskQueue/STHTTPNetTask.m

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
#import "STHTTPNetTask.h"
10+
#import "STHTTPNetTaskParametersPacker.h"
1011

1112
NSString *const STHTTPNetTaskServerError = @"STHTTPNetTaskServerError";
1213
NSString *const STHTTPNetTaskResponseParsedError = @"STHTTPNetTaskResponseParsedError";
@@ -96,4 +97,42 @@ - (NSArray *)ignoredProperties
9697
return nil;
9798
}
9899

100+
- (NSString *)description
101+
{
102+
NSDictionary *methodMap = @{ @(STHTTPNetTaskGet): @"GET",
103+
@(STHTTPNetTaskDelete): @"DELETE",
104+
@(STHTTPNetTaskHead): @"HEAD",
105+
@(STHTTPNetTaskPatch): @"PATCH",
106+
@(STHTTPNetTaskPost): @"POST",
107+
@(STHTTPNetTaskPut): @"PUT" };
108+
NSDictionary *requestTypeMap = @{ @(STHTTPNetTaskRequestJSON): @"JSON",
109+
@(STHTTPNetTaskRequestKeyValueString): @"Key-Value String",
110+
@(STHTTPNetTaskRequestFormData): @"Form Data" };
111+
NSDictionary *responseTypeMap = @{ @(STHTTPNetTaskResponseJSON): @"JSON",
112+
@(STHTTPNetTaskResponseString): @"String",
113+
@(STHTTPNetTaskResponseRawData): @"Raw Data" };
114+
115+
NSMutableString *desc = [NSMutableString new];
116+
[desc appendFormat:@"URI: %@\n", self.uri];
117+
[desc appendFormat:@"Method: %@\n", methodMap[@(self.method)]];
118+
[desc appendFormat:@"Request Type: %@\n", requestTypeMap[@(self.requestType)]];
119+
[desc appendFormat:@"Response Type: %@\n", responseTypeMap[@(self.responseType)]];
120+
121+
NSDictionary *headers = self.headers;
122+
if (headers.count) {
123+
[desc appendFormat:@"Custom Headers:\n%@\n", headers];
124+
}
125+
NSDictionary *datas = self.datas;
126+
if (datas.count) {
127+
[desc appendFormat:@"Form Datas:\n"];
128+
for (NSString *name in datas) {
129+
NSData *data = datas[name];
130+
[desc appendFormat:@"%@: %td bytes\n", name, data.length];
131+
}
132+
}
133+
134+
[desc appendFormat:@"Parameters:\n%@\n", [[[STHTTPNetTaskParametersPacker alloc] initWithNetTask:self] pack]];
135+
return desc;
136+
}
137+
99138
@end

STNetTaskQueue/STHTTPNetTaskQueueHandler.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ - (void)netTaskQueue:(STNetTaskQueue *)netTaskQueue handleTask:(STNetTask *)task
163163
code:0
164164
userInfo:@{ STHTTPNetTaskErrorStatusCodeUserInfoKey: @(httpResponse.statusCode),
165165
STHTTPNetTaskErrorResponseDataUserInfoKey: data }];
166-
[STNetTaskQueueLog log:@"HTTP error with url: %@\nMethod: %@\nPayload: %@", httpResponse.URL.absoluteString, _methodMap[@(httpTask.method)], parameters];
166+
[STNetTaskQueueLog log:httpTask.description];
167167
}
168168
[netTaskQueue task:task didFailWithError:error];
169169
}

STNetTaskQueue/STNetTaskQueue.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ - (void)addTask:(STNetTask *)task
7070
NSAssert(self.handler, @"STNetTaskQueueHandler is not set.");
7171
NSAssert(!task.finished, @"STNetTask is finished, please recreate a net task.");
7272
task.pending = YES;
73-
[self performSelector:@selector(_addTask:) onThread:self.thred withObject:task waitUntilDone:NO modes:@[ NSRunLoopCommonModes ]];
73+
[self performSelector:@selector(_addTask:) onThread:self.thred withObject:task waitUntilDone:NO];
7474
}
7575

7676
- (void)_addTask:(STNetTask *)task

0 commit comments

Comments
 (0)