add log

YangSen-qn · YangSen-qn · commit 2bc9633d366c · 2020-12-28T18:46:00.000+08:00
diff --git a/QiniuSDK/Collect/QNReportItem.m b/QiniuSDK/Collect/QNReportItem.m
@@ -8,6 +8,7 @@
 
 #import "QNReportItem.h"
 #import "QNAsyncRun.h"
+#import "QNLogUtil.h"
 
 @interface QNReportItem()
 
@@ -72,6 +73,7 @@ @implementation QNUploadInfoReporter(ReportItem)
 - (void)reportItem:(QNReportItem *)item token:(NSString *)token{
     QNAsyncRun(^{
         NSString *itemJsonString = [item toJson];
+        QNLogInfo(@"up log:%@", itemJsonString);
         if (itemJsonString && ![itemJsonString isEqualToString:@"{}"]) {
             [self report:itemJsonString token:token];
         }
diff --git a/QiniuSDK/Http/Request/QNHttpRegionRequest.m b/QiniuSDK/Http/Request/QNHttpRegionRequest.m
@@ -7,6 +7,7 @@
 //
 
 #import "QNDefine.h"
+#import "QNLogUtil.h"
 #import "QNAsyncRun.h"
 #import "QNHttpRegionRequest.h"
 #import "QNConfiguration.h"
@@ -20,6 +21,7 @@ @interface QNHttpRegionRequest()
 
 @property(nonatomic, strong)QNConfiguration *config;
 @property(nonatomic, strong)QNUploadOption *uploadOption;
+@property(nonatomic, strong)QNUploadRequestInfo *requestInfo;
 @property(nonatomic, strong)QNUploadRequestState *requestState;
 
 @property(nonatomic, strong)QNUploadRegionRequestMetrics *requestMetrics;
@@ -43,6 +45,7 @@ - (instancetype)initWithConfig:(QNConfiguration *)config
         _config = config;
         _uploadOption = uploadOption;
         _region = region;
+        _requestInfo = requestInfo;
         _requestState = requestState;
         _singleRequest = [[QNHttpSingleRequest alloc] initWithConfig:config
                                                         uploadOption:uploadOption
@@ -153,6 +156,9 @@ - (void)performRequest:(id <QNUploadServer>)server
     [request setTimeoutInterval:self.config.timeoutInterval];
     request.HTTPBody = body;
     
+    QNLogInfo(@"key:%@ url:%@", self.requestInfo.key, request.URL);
+    QNLogInfo(@"key:%@ headers:%@", self.requestInfo.key, headers);
+    
     kQNWeakSelf;
     [self.singleRequest request:request
                          server:server
diff --git a/QiniuSDK/Http/Request/QNHttpSingleRequest.m b/QiniuSDK/Http/Request/QNHttpSingleRequest.m
@@ -10,6 +10,7 @@
 #import "QNAsyncRun.h"
 #import "QNVersion.h"
 #import "QNUtils.h"
+#import "QNLogUtil.h"
 #import "QNHttpSingleRequest.h"
 #import "QNConfiguration.h"
 #import "QNUploadOption.h"
@@ -107,6 +108,8 @@ - (void)retryRequest:(NSURLRequest *)request
         return isCancelled;
     };
 
+    QNLogInfo(@"key:%@ retry:%d url:%@", self.requestInfo.key, self.currentRetryTime, request.URL);
+    
     [self.client request:request connectionProxy:self.config.proxy progress:^(long long totalBytesWritten, long long totalBytesExpectedToWrite) {
         kQNStrongSelf;
         
@@ -142,6 +145,7 @@ - (void)retryRequest:(NSURLRequest *)request
                                                                response:(NSHTTPURLResponse *)response
                                                                    body:responseData
                                                                   error:error];
+        QNLogInfo(@"key:%@ response:%@", self.requestInfo.key, responseInfo);
         if (shouldRetry(responseInfo, responseDic)
             && self.currentRetryTime < self.config.retryMax
             && responseInfo.couldHostRetry) {
diff --git a/QiniuSDK/Http/ServerRegion/QNUploadDomainRegion.m b/QiniuSDK/Http/ServerRegion/QNUploadDomainRegion.m
@@ -12,6 +12,7 @@
 #import "QNZoneInfo.h"
 #import "QNUploadServerFreezeManager.h"
 #import "QNDnsPrefetch.h"
+#import "QNLogUtil.h"
 #import "QNUtils.h"
 
 @interface QNUploadIpGroup : NSObject
@@ -247,13 +248,16 @@ - (NSDictionary *)createDomainDictionary:(NSArray <NSString *> *)hosts{
     if (server == nil) {
         self.isAllFrozen = YES;
     }
+    
+    QNLogInfo(@"get server host:%@ ip:%@", server.host, server.ip);
     return server;
 }
 
 - (void)freezeServerIfNeed:(QNResponseInfo *)responseInfo freezeServer:(QNUploadServer *)freezeServer {
     if (freezeServer.serverId) {
         // 无法连接到Host || Host不可用， 局部冻结
         if (!responseInfo.canConnectToHost || responseInfo.isHostUnavailable) {
+            QNLogInfo(@"partial freeze server host:%@ ip:%@", freezeServer.host, freezeServer.ip);
             [_domainDictionary[freezeServer.serverId] freeze:freezeServer.ip
                                                freezeManager:self.partialFreezeManager
                                                   frozenTime:kQNGlobalConfiguration.partialHostFrozenTime];
@@ -264,6 +268,7 @@ - (void)freezeServerIfNeed:(QNResponseInfo *)responseInfo freezeServer:(QNUpload
         
         // Host不可用，全局冻结
         if (responseInfo.isHostUnavailable) {
+            QNLogInfo(@"global freeze server host:%@ ip:%@", freezeServer.host, freezeServer.ip);
             [_domainDictionary[freezeServer.serverId] freeze:freezeServer.ip
                                                freezeManager:kQNUploadServerFreezeManager
                                                   frozenTime:kQNGlobalConfiguration.globalHostFrozenTime];
diff --git a/QiniuSDK/Storage/QNConcurrentResumeUpload.m b/QiniuSDK/Storage/QNConcurrentResumeUpload.m
@@ -6,6 +6,7 @@
 //  Copyright © 2019 Qiniu. All rights reserved.
 //
 
+#import "QNLogUtil.h"
 #import "QNConcurrentResumeUpload.h"
 
 @interface QNConcurrentResumeUpload()
@@ -24,6 +25,8 @@ - (int)prepareToUpload{
 }
 
 - (void)uploadRestData:(dispatch_block_t)completeHandler {
+    QNLogInfo(@"key:%@ 并发分片", self.key);
+    
     for (int i = 0; i < self.config.concurrentTaskCount; i++) {
         dispatch_group_enter(self.uploadGroup);
         dispatch_group_async(self.uploadGroup, self.uploadQueue, ^{
diff --git a/QiniuSDK/Storage/QNPartsUpload.m b/QiniuSDK/Storage/QNPartsUpload.m
@@ -8,6 +8,7 @@
 
 #import "QNDefine.h"
 #import "QNUtils.h"
+#import "QNLogUtil.h"
 #import "QNPartsUpload.h"
 #import "QNZoneInfo.h"
 #import "QNReportItem.h"
@@ -33,6 +34,7 @@ - (void)initData {
     [super initData];
     // 根据文件从本地恢复上传信息，如果没有则重新构建上传信息
     if (self.config.resumeUploadVersion == QNResumeUploadVersionV1) {
+        QNLogInfo(@"key:%@ 分片V1", self.key);
         self.uploadPerformer = [[QNPartsUploadPerformerV1 alloc] initWithFile:self.file
                                                                      fileName:self.fileName
                                                                           key:self.key
@@ -41,6 +43,7 @@ - (void)initData {
                                                                 configuration:self.config
                                                                   recorderKey:self.recorderKey];
     } else {
+        QNLogInfo(@"key:%@ 分片V2", self.key);
         self.uploadPerformer = [[QNPartsUploadPerformerV2 alloc] initWithFile:self.file
                                                                      fileName:self.fileName
                                                                           key:self.key
@@ -75,10 +78,12 @@ - (int)prepareToUpload{
     if (self.uploadPerformer.currentRegion && self.uploadPerformer.currentRegion.isValid) {
         // currentRegion有值，为断点续传，将region插入至regionList第一处
         [self insertRegionAtFirst:self.uploadPerformer.currentRegion];
+        QNLogInfo(@"key:%@ 使用缓存region", self.key);
     } else {
         // currentRegion无值 切换region
         [self.uploadPerformer switchRegion:[self getCurrentRegion]];
     }
+    QNLogInfo(@"key:%@ region:%@", self.key, self.uploadPerformer.currentRegion.zoneInfo.regionId);
     
     if (self.file == nil) {
         code = kQNLocalIOError;
@@ -90,6 +95,7 @@ - (BOOL)switchRegion{
     BOOL isSuccess = [super switchRegion];
     if (isSuccess) {
         [self.uploadPerformer switchRegion:self.getCurrentRegion];
+        QNLogInfo(@"key:%@ 切换region：%@", self.key , self.uploadPerformer.currentRegion.zoneInfo.regionId);
     }
     return isSuccess;
 }
@@ -106,8 +112,11 @@ - (void)startToUpload{
     self.uploadDataErrorResponseInfo = nil;
     self.uploadDataErrorResponse = nil;
     
-    kQNWeakSelf;
+    
+    QNLogInfo(@"key:%@ serverInit", self.key);
+    
     // 1. 启动upload
+    kQNWeakSelf;
     [self serverInit:^(QNResponseInfo * _Nullable responseInfo, NSDictionary * _Nullable response) {
         kQNStrongSelf;
         
@@ -118,8 +127,10 @@ - (void)startToUpload{
             return;
         }
         
-        kQNWeakSelf;
+        QNLogInfo(@"key:%@ uploadRestData", self.key);
+        
         // 2. 上传数据
+        kQNWeakSelf;
         [self uploadRestData:^{
             kQNStrongSelf;
             
@@ -130,8 +141,10 @@ - (void)startToUpload{
                 return;
             }
             
-            kQNWeakSelf;
+            QNLogInfo(@"key:%@ completeUpload", self.key);
+            
             // 3. 组装文件
+            kQNWeakSelf;
             [self completeUpload:^(QNResponseInfo * _Nullable responseInfo, NSDictionary * _Nullable response) {
                 kQNStrongSelf;
                                 
@@ -152,7 +165,7 @@ - (void)startToUpload{
 }
 
 - (void)uploadRestData:(dispatch_block_t)completeHandler {
-    
+    QNLogInfo(@"key:%@ 串行分片", self.key);
     [self performUploadRestData:completeHandler];
 }
 
diff --git a/QiniuSDK/Storage/QNPartsUploadPerformer.m b/QiniuSDK/Storage/QNPartsUploadPerformer.m
@@ -6,6 +6,7 @@
 //  Copyright © 2020 Qiniu. All rights reserved.
 //
 
+#import "QNLogUtil.h"
 #import "QNAsyncRun.h"
 #import "QNUpToken.h"
 #import "QNZoneInfo.h"
@@ -114,29 +115,35 @@ - (void)recordUploadInfo {
             [self.recorder set:key data:data];
         }
     }
+    QNLogInfo(@"key:%@ recorderKey:%@ recordUploadInfo", self.key, self.recorderKey);
 }
 
 - (void)removeUploadInfoRecord {
     
     self.recoveredFrom = nil;
     [self.fileInfo clearUploadState];
     [self.recorder del:self.recorderKey];
+    QNLogInfo(@"key:%@ recorderKey:%@ removeUploadInfoRecord", self.key, self.recorderKey);
 }
 
 - (void)recoverUploadInfoFromRecord {
+    QNLogInfo(@"key:%@ recorderKey:%@ recorder:%@ recoverUploadInfoFromRecord", self.key, self.recorderKey, self.recorder);
+    
     NSString *key = self.recorderKey;
     if (self.recorder == nil || key == nil || [key isEqualToString:@""]) {
         return;
     }
 
     NSData *data = [self.recorder get:key];
     if (data == nil) {
+        QNLogInfo(@"key:%@ recorderKey:%@ recoverUploadInfoFromRecord data:nil", self.key, self.recorderKey);
         return;
     }
 
     NSError *error = nil;
     NSDictionary *info = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableLeaves error:&error];
     if (error != nil || ![info isKindOfClass:[NSDictionary class]]) {
+        QNLogInfo(@"key:%@ recorderKey:%@ recoverUploadInfoFromRecord json error", self.key, self.recorderKey);
         [self.recorder del:self.key];
         return;
     }
@@ -146,6 +153,7 @@ - (void)recoverUploadInfoFromRecord {
     
     if (zoneInfo && fileInfo && ![fileInfo isEmpty]
         && fileInfo.size == self.file.size && fileInfo.modifyTime == self.file.modifyTime) {
+        QNLogInfo(@"key:%@ recorderKey:%@ recoverUploadInfoFromRecord valid", self.key, self.recorderKey);
         
         self.fileInfo = fileInfo;
         
@@ -155,6 +163,8 @@ - (void)recoverUploadInfoFromRecord {
         self.targetRegion = region;
         self.recoveredFrom = @(fileInfo.progress * fileInfo.size);
     } else {
+        QNLogInfo(@"key:%@ recorderKey:%@ recoverUploadInfoFromRecord invalid", self.key, self.recorderKey);
+        
         [self.recorder del:self.key];
         self.currentRegion = nil;
         self.targetRegion = nil;
diff --git a/QiniuSDK/Storage/QNPartsUploadPerformerV1.m b/QiniuSDK/Storage/QNPartsUploadPerformerV1.m
@@ -6,6 +6,7 @@
 //  Copyright © 2020 Qiniu. All rights reserved.
 //
 
+#import "QNLogUtil.h"
 #import "QNDefine.h"
 #import "QNRequestTransaction.h"
 #import "QNUploadFileInfoPartV1.h"
@@ -52,13 +53,17 @@ - (void)uploadNextData:(void(^)(BOOL stop,
     }
 
     if (block == nil || chunk == nil) {
+        QNLogInfo(@"key:%@ no chunk left", self.key);
         QNResponseInfo *responseInfo = [QNResponseInfo responseInfoWithSDKInteriorError:@"no chunk left"];
+        
         completeHandler(YES, responseInfo, nil, nil);
         return;
     }
     
     NSData *chunkData = [self getDataWithChunk:chunk block:block];
     if (chunkData == nil) {
+        QNLogInfo(@"key:%@ get chunk data error", self.key);
+        
         chunk.isUploading = NO;
         chunk.isCompleted = NO;
         QNResponseInfo *responseInfo = [QNResponseInfo responseInfoWithLocalIOError:@"get chunk data error"];
@@ -93,8 +98,10 @@ - (void)uploadNextData:(void(^)(BOOL stop,
     };
     
     if (chunk.isFirstData) {
+        QNLogInfo(@"key:%@ makeBlock", self.key);
         [self makeBlock:block firstChunk:chunk chunkData:chunkData progress:progress completeHandler:completeHandlerP];
     } else {
+        QNLogInfo(@"key:%@ uploadChunk", self.key);
         [self uploadChunk:block chunk:chunk chunkData:chunkData progress:progress completeHandler:completeHandlerP];
     }
 }
diff --git a/QiniuSDK/Storage/QNPartsUploadPerformerV2.m b/QiniuSDK/Storage/QNPartsUploadPerformerV2.m
@@ -6,6 +6,7 @@
 //  Copyright © 2020 Qiniu. All rights reserved.
 //
 
+#import "QNLogUtil.h"
 #import "QNDefine.h"
 #import "QNRequestTransaction.h"
 #import "QNUploadFileInfoPartV2.h"
@@ -28,8 +29,10 @@ - (QNUploadFileInfo *)getDefaultUploadFileInfo {
 - (void)serverInit:(void(^)(QNResponseInfo * _Nullable responseInfo,
                             QNUploadRegionRequestMetrics * _Nullable metrics,
                             NSDictionary * _Nullable response))completeHandler {
+    
     QNUploadFileInfoPartV2 *fileInfo = (QNUploadFileInfoPartV2 *)self.fileInfo;
     if (fileInfo && [fileInfo isValid]) {
+        QNLogInfo(@"key:%@ serverInit success", self.key);
         QNResponseInfo *responseInfo = [QNResponseInfo successResponse];
         completeHandler(responseInfo, nil, nil);
         return;
@@ -69,6 +72,8 @@ - (void)uploadNextData:(void(^)(BOOL stop,
     }
     // 上传完毕
     if (data == nil) {
+        QNLogInfo(@"key:%@ no data left", self.key);
+        
         QNResponseInfo *responseInfo = [QNResponseInfo responseInfoWithSDKInteriorError:@"no data left"];
         completeHandler(YES, responseInfo, nil, nil);
         return;
@@ -77,6 +82,8 @@ - (void)uploadNextData:(void(^)(BOOL stop,
     // 本地读异常
     NSData *uploadData = [self getUploadData:data];
     if (uploadData == nil) {
+        QNLogInfo(@"key:%@ get data error", self.key);
+        
         data.isUploading = NO;
         data.isCompleted = NO;
         QNResponseInfo *responseInfo = [QNResponseInfo responseInfoWithLocalIOError:@"get data error"];
diff --git a/QiniuSDK/Utils/QNLogUtil.h b/QiniuSDK/Utils/QNLogUtil.h
@@ -23,21 +23,30 @@ typedef NS_ENUM(NSInteger, QNLogLevel){
 
 + (void)setLogLevel:(QNLogLevel)level;
 
++ (void)enableLogDate:(BOOL)enable;
++ (void)enableLogFile:(BOOL)enable;
++ (void)enableLogFunction:(BOOL)enable;
+
 + (void)log:(QNLogLevel)level
-       file:(NSString *)file
-   function:(NSString *)function
+       file:(const char *)file
+   function:(const char *)function
        line:(NSUInteger)line
-     format:(NSString *)format, ...;
+     format:(NSString * _Nullable)format, ...;
 
 
 @end
 
-#define QNLog(level, format) [QNLogUtil log:level file:__File__ function:__func__ line:__LINE__ format:format]
-
-#define QNLogError(format)   QNLog(QNLogLevelError, format)
-#define QNLogWarn(format)    QNLog(QNLogLevelWarn, format)
-#define QNLogInfo(format)    QNLog(QNLogLevelInfo, format)
-#define QNLogDebug(format)   QNLog(QNLogLevelDebug, format)
-#define QNLogVerbose(format) QNLog(QNLogLevelVerbose, format)
+#define QNLog(level, fmt, ...) \
+    [QNLogUtil log:level \
+              file:__FILE__ \
+          function:__FUNCTION__  \
+              line:__LINE__ \
+              format:(fmt), ##__VA_ARGS__]
+
+#define QNLogError(format, ...)   QNLog(QNLogLevelError, format, ##__VA_ARGS__)
+#define QNLogWarn(format, ...)    QNLog(QNLogLevelWarn, format, ##__VA_ARGS__)
+#define QNLogInfo(format, ...)    QNLog(QNLogLevelInfo, format, ##__VA_ARGS__)
+#define QNLogDebug(format, ...)   QNLog(QNLogLevelDebug, format, ##__VA_ARGS__)
+#define QNLogVerbose(format, ...) QNLog(QNLogLevelVerbose, format, ##__VA_ARGS__)
 
 NS_ASSUME_NONNULL_END
diff --git a/QiniuSDK/Utils/QNLogUtil.m b/QiniuSDK/Utils/QNLogUtil.m
