kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-04-22 11:46:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update logger to display basic info about an input stream used to send a request instead of wrongly logging request.body=(null)

Browse Source
This commit is contained in:
Blake Watters
2012-10-25 13:18:01 -04:00
parent 4d5d76671c
commit a484af05f5
1 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Code/Network/RKHTTPRequestOperation.m
View File

@@ -49,6 +49,34 @@ static NSString *RKLogTruncateString(NSString *string)
(long) maxMessageLength];
}
static NSString *RKStringFromStreamStatus(NSStreamStatus streamStatus)
{
switch (streamStatus) {
case NSStreamStatusNotOpen: return @"Not Open";
case NSStreamStatusOpening: return @"Opening";
case NSStreamStatusOpen: return @"Open";
case NSStreamStatusReading: return @"Reading";
case NSStreamStatusWriting: return @"Writing";
case NSStreamStatusAtEnd: return @"At End";
case NSStreamStatusClosed: return @"Closed";
case NSStreamStatusError: return @"Error";
default: break;
}
return nil;
}
static NSString *RKStringDescribingStream(NSStream *stream)
{
NSString *errorDescription = ([stream streamStatus] == NSStreamStatusError) ? [NSString stringWithFormat:@", error=%@", [stream streamError]] : @"";
if ([stream isKindOfClass:[NSInputStream class]]) {
return [NSString stringWithFormat:@"<%@: %p hasBytesAvailable=%@, status='%@'%@>", [stream class], stream, [(NSInputStream *)stream hasBytesAvailable] ? @"YES" : @"NO", RKStringFromStreamStatus([stream streamStatus]), errorDescription];
} else if ([stream isKindOfClass:[NSOutputStream class]]) {
return [NSString stringWithFormat:@"<%@: %p hasSpaceAvailable=%@, status='%@'%@>", [stream class], stream, [(NSOutputStream *)stream hasSpaceAvailable] ? @"YES" : @"NO", RKStringFromStreamStatus([stream streamStatus]), errorDescription];
} else {
return [stream description];
}
}
@interface RKHTTPRequestOperationLogger : NSObject
+ (id)sharedLogger;
@@ -102,6 +130,8 @@ static NSString *RKLogTruncateString(NSString *string)
NSString *body = nil;
if ([operation.request HTTPBody]) {
body = RKLogTruncateString([NSString stringWithUTF8String:[[operation.request HTTPBody] bytes]]);
} else if ([operation.request HTTPBodyStream]) {
body = RKStringDescribingStream([operation.request HTTPBodyStream]);
}
RKLogTrace(@"%@ '%@':\nrequest.headers=%@\nrequest.body=%@", [operation.request HTTPMethod], [[operation.request URL] absoluteString], [operation.request allHTTPHeaderFields], body);