Merge pull request #206 from sonic-ios-dev/dev

vasdeveloper · web-flow · commit fa5dec409943 · 2018-02-07T22:02:58.000+08:00
Write the log into event notification form
diff --git a/sonic-iOS/Sonic/Cache/SonicCache.m b/sonic-iOS/Sonic/Cache/SonicCache.m
@@ -382,7 +382,7 @@ - (SonicCacheItem *)updateWithJsonData:(NSData *)jsonData
 #if DEBUG
         NSAssert(sha1.length>0, errMsg);
 #endif
-        NSLog(@"%@",errMsg);
+        SonicLogEvent(@"%@",errMsg);
     }
     [config setObject:sha1 forKey:kSonicSha1];
     cacheItem.config = config;
@@ -799,10 +799,10 @@ - (void)checkAndTrimRootCache
     unsigned long long lastTrimStamp = [[[NSUserDefaults standardUserDefaults] objectForKey:kSonicRootCacheTrimTimestampUDF] longLongValue];
     unsigned long long duration = currentTimeStamp() - lastTrimStamp;
     if (duration < [SonicConfiguration defaultConfiguration].rootCacheSizeCheckDuration) {
-        NSLog(@"Trim root cache in duration!");
+        SonicLogEvent(@"Trim root cache in duration!");
         return;
     }
-    NSLog(@"Trim root cache start !");
+    SonicLogEvent(@"Trim root cache start !");
     [self checkAndTrimCacheAtDirPath:_rootCachePath unIncludeSubDir:SonicRootCacheConfigDirName withMaxDirectorySize:[SonicConfiguration defaultConfiguration].cacheMaxDirectorySize withWarningPercent:[SonicConfiguration defaultConfiguration].cacheDirectorySizeWarningPercent];
     [[NSUserDefaults standardUserDefaults] setObject:[@(currentTimeStamp()) stringValue] forKey:kSonicRootCacheTrimTimestampUDF];
 }
@@ -876,7 +876,7 @@ - (void)checkAndTrimCacheAtDirPath:(NSString *)dirPath unIncludeSubDir:(NSString
                 
                 [SonicFileManager removeItemAtPath:subDir error:nil];
                 
-                NSLog(@"trim clear cache at subDir :%@",subDir);
+                SonicLogEvent(@"trim clear cache at subDir :%@",subDir);
             }
         }
         
@@ -927,7 +927,7 @@ - (BOOL)setupSubResourceCacheDirectory
     
     _rootResourceCachePath = [[self createDirectoryIfNotExist:[paths objectAtIndex:0] withSubPath:SonicResourceCacheDirName] copy];
     
-    NSLog(@"resource cache path:%@",_rootResourceCachePath);
+    SonicLogEvent(@"resource cache path:%@",_rootResourceCachePath);
     
     [self setupSubResourceConfigDirectory];
 
@@ -971,7 +971,7 @@ - (BOOL)saveSubResourceData:(NSData *)data withConfig:(NSDictionary *)config wit
         [SonicFileManager removeItemAtPath:cacheFilePath error:nil];
     }
     
-    NSLog(@"resource save state:%d sessionID:%@",isSuccess,sessionID);
+    SonicLogEvent(@"resource save state:%d sessionID:%@",isSuccess,sessionID);
     
     return isSuccess;
 }
@@ -1010,7 +1010,7 @@ - (void)checkAndTrimResourceCache
     unsigned long long lastTrimStamp = [[[NSUserDefaults standardUserDefaults] objectForKey:kSonicResourceCacheTrimTimestampUDF] longLongValue];
     unsigned long long duration = currentTimeStamp() - lastTrimStamp;
     if (duration < [SonicConfiguration defaultConfiguration].resourceCacheSizeCheckDuration) {
-        NSLog(@"Trim resource cache in duration!");
+        SonicLogEvent(@"Trim resource cache in duration!");
         return;
     }
     //event
diff --git a/sonic-iOS/Sonic/Cache/SonicDatabase.m b/sonic-iOS/Sonic/Cache/SonicDatabase.m
@@ -19,6 +19,7 @@
 
 #import "SonicDatabase.h"
 #import "sqlite3.h"
+#import "SonicEventStatistics.h"
 
 #if  __has_feature(objc_arc)
 #error This file must be compiled without ARC. Use -fno-objc-arc flag.
@@ -47,7 +48,7 @@ - (instancetype)initWithPath:(NSString *)dbPath
         
         if (ret != SQLITE_OK) {
             
-            NSLog(@"database open db faild :%@ code:%d",dbPath,ret);
+            SonicLogEvent(@"database open db faild :%@ code:%d",dbPath,ret);
         }
         
         [self createConfigTableIfNotExist];
@@ -80,7 +81,7 @@ - (BOOL)execSql:(NSString *)sql
     
     int ret = sqlite3_exec(_db, sql.UTF8String, NULL, NULL, NULL);
     if (ret != SQLITE_OK) {
-        NSLog(@"sql error:%@",sql);
+        SonicLogEvent(@"sql error:%@",sql);
     }
     return ret == SQLITE_OK;
 }
diff --git a/sonic-iOS/Sonic/Network/SonicServer.m b/sonic-iOS/Sonic/Network/SonicServer.m
@@ -299,7 +299,7 @@ - (NSDictionary *)sonicItemForCache
         }
         return nil;
     }
-    NSLog(@"sonicItemForCache warning:Should never call this function before connection did completion!");
+    SonicLogEvent(@"sonicItemForCache warning:Should never call this function before connection did completion!");
     return nil;
 }
 
@@ -407,7 +407,7 @@ - (void)connectionDidCompleteWithoutError:(SonicConnection *)connection
             
             //if http status is 304, there is nothing changed
             if (self.response.statusCode == 304) {
-                NSLog(@"response status 304!");
+                SonicLogEvent(@"Response status 304!");
                 break;
             }
             
diff --git a/sonic-iOS/Sonic/Network/SonicURLProtocol.m b/sonic-iOS/Sonic/Network/SonicURLProtocol.m
@@ -40,15 +40,15 @@ + (BOOL)canInitWithRequest:(NSURLRequest *)request
             if (session && [sessionID isEqualToString:session.sessionID]) {
                 return YES;
             }
-            NSLog(@"SonicURLProtocol.canInitWithRequest error:Cannot find sonic session!");
+            SonicLogEvent(@"SonicURLProtocol.canInitWithRequest error:Cannot find sonic session!");
         }
     }
     
     //Sub resource intercept
     NSString * sessionID = sonicSessionID(request.mainDocumentURL.absoluteString);
     SonicSession *session = [[SonicEngine sharedEngine] sessionById:sessionID];
     if (session.resourceLoader && [session.resourceLoader canInterceptResourceWithUrl:request.URL.absoluteString]) {
-        NSLog(@"SonicURLProtocol resource should intercept:%@",request.debugDescription);
+        SonicLogEvent(@"SonicURLProtocol resource should intercept:%@",request.debugDescription);
         return YES;
     }
     
@@ -71,7 +71,7 @@ - (void)startLoading
     
     if ([session.resourceLoader canInterceptResourceWithUrl:self.request.URL.absoluteString]) {
         
-        NSLog(@"protocol resource did start loading :%@",self.request.debugDescription);
+        SonicLogEvent(@"protocol resource did start loading :%@",self.request.debugDescription);
 
         SonicSession *session = [[SonicEngine sharedEngine] sessionById:sessionID];
         
@@ -118,14 +118,14 @@ - (void)callClientActionWithParams:(NSDictionary *)params
             NSData *recvData = params[kSonicProtocolData];
             if (recvData.length > 0) {
                 [self.client URLProtocol:self didLoadData:recvData];
-                NSLog(@"protocol did load data length:%ld",recvData.length);
+                SonicLogEvent(@"protocol did load data length:%ld",recvData.length);
             }
         }
             break;
         case SonicURLProtocolActionDidSuccess:
         {
             [self.client URLProtocolDidFinishLoading:self];
-            NSLog(@"protocol did finish loading request:%@",self.request.debugDescription);
+            SonicLogEvent(@"protocol did finish loading request:%@",self.request.debugDescription);
         }
             break;
         case SonicURLProtocolActionDidFaild:
diff --git a/sonic-iOS/Sonic/ResourceLoader/SonicResourceLoadOperation.m b/sonic-iOS/Sonic/ResourceLoader/SonicResourceLoadOperation.m
@@ -72,7 +72,7 @@ - (instancetype)initWithUrl:(NSString *)aUrl
             }
             if (isCacheExpire) {
                 self.config = nil;
-                NSLog(@"resource expire:%@",self.url);
+                SonicLogEvent(@"resource expire:%@",self.url);
             }else{
                 self.cacheFileData = [[SonicCache shareCache] resourceCacheWithSessionID:self.sessionID];
                 NSString *cacheFileSha1 = getDataSha1(self.cacheFileData);
@@ -87,7 +87,7 @@ - (instancetype)initWithUrl:(NSString *)aUrl
                 }else{
                     self.cacheFileData = nil;
                     self.config = nil;
-                    NSLog(@"resource sha1 wrong:%@",self.url);
+                    SonicLogEvent(@"resource sha1 wrong:%@",self.url);
                 }
             }
         }
@@ -126,7 +126,7 @@ - (void)preloadDataWithProtocolCallBack:(SonicURLProtocolCallBack)callBack
         dataItem = [SonicUtil protocolActionItem:SonicURLProtocolActionLoadData param:self.cacheFileData];
         [self.lock unlock];
         finishItem = [SonicUtil protocolActionItem:SonicURLProtocolActionDidSuccess param:nil];
-        NSLog(@"resource read from cache:%@",self.url);
+        SonicLogEvent(@"resource read from cache:%@",self.url);
         [actions addObjectsFromArray:@[rspItem,dataItem,finishItem]];
     }else{
         if (self.isComplete) {
@@ -135,7 +135,7 @@ - (void)preloadDataWithProtocolCallBack:(SonicURLProtocolCallBack)callBack
             dataItem = [SonicUtil protocolActionItem:SonicURLProtocolActionLoadData param:self.responseData];
             [self.lock unlock];
             finishItem = [SonicUtil protocolActionItem:SonicURLProtocolActionDidSuccess param:nil];
-            NSLog(@"resource read from network:%@",self.url);
+            SonicLogEvent(@"resource read from network:%@",self.url);
             [actions addObjectsFromArray:@[rspItem,dataItem,finishItem]];
         }else{
             [self.lock lock];
@@ -148,7 +148,7 @@ - (void)preloadDataWithProtocolCallBack:(SonicURLProtocolCallBack)callBack
                 [actions addObject:dataItem];
             }
             [self.lock unlock];
-            NSLog(@"resource read from network preload:%@",self.url);
+            SonicLogEvent(@"resource read from network preload:%@",self.url);
         }
     }
     self.protocolCallBack = callBack;
@@ -233,7 +233,7 @@ - (void)connection:(SonicConnection *)connection didReceiveData:(NSData *)data
 
 - (void)connection:(SonicConnection *)connection didCompleteWithError:(NSError *)error
 {
-    NSLog(@"resource recieve error:%@",error.debugDescription);
+    SonicLogEvent(@"resource recieve error:%@",error.debugDescription);
 
     [self disaptchProtocolAction:SonicURLProtocolActionDidFaild withParam:error];
     self.isComplete = YES;
@@ -263,7 +263,7 @@ - (void)connectionDidCompleteWithoutError:(SonicConnection *)connection
                                                                                                                      @"reseponse":headersLog
                                                                                                                      }];
         }else{
-            NSLog(@"config create fail to save resource:%@",self.url);
+            SonicLogEvent(@"config create fail to save resource:%@",self.url);
         }
     }];
     [[SonicCache subResourceQueue] addOperation:block];
diff --git a/sonic-iOS/Sonic/Session/SonicSession.m b/sonic-iOS/Sonic/Session/SonicSession.m
@@ -184,7 +184,7 @@ - (void)start
     if (self.configuration.supportCacheControl) {
         SonicCacheItem *cacheItem = [[SonicCache shareCache] cacheForSession:self.sessionID];
         if (![cacheItem isCacheExpired]) {
-            NSLog(@"SonicSession.start finish:session(%@) is under cache expired.", self.sessionID);
+            SonicLogEvent(@"SonicSession.start finish:session(%@) is under cache expired.", self.sessionID);
             return;
         }
     }
@@ -435,7 +435,7 @@ - (void)firstLoadDidSuccess
     if (200 == self.sonicServer.response.statusCode) {
         [self dealWithFirstLoad];
     } else {
-        NSLog(@"firstLoadDidSuccess warning:statusCode[%ld] miss!", (long)self.sonicServer.response.statusCode);
+        SonicLogEvent(@"firstLoadDidSuccess warning:statusCode[%ld] miss!", (long)self.sonicServer.response.statusCode);
     }
     
     [self checkAutoCompletionAction];
@@ -464,7 +464,7 @@ - (void)dealWithFirstLoad
         if (self.configuration.supportCacheControl) {
             NSString *cacheControl = [self.sonicServer responseHeaderForKey:SonicHeaderValueCacheControl];
             if ([cacheControl isEqualToString:@"no-cache"] || [cacheControl isEqualToString:@"no-store"] || [cacheControl isEqualToString:@"must-revalidate"]) {
-                NSLog(@"cache control need't cache!");
+                SonicLogEvent(@"cache control need't cache!");
                 return;
             }
         }
@@ -473,7 +473,7 @@ - (void)dealWithFirstLoad
             
             NSDictionary *serverResult = [self.sonicServer sonicItemForCache];
             if (!serverResult) {
-                NSLog(@"Sonic first load item for cache nil");
+                SonicLogEvent(@"Sonic first load item for cache nil");
                 return;
             }
             
@@ -668,7 +668,7 @@ - (NSDictionary *)sonicDiffResult
     NSDictionary *extra = @{@"template-tag":templateTag,@"eTag":etag,@"isReload":isRefresh,@"cache-offline":cacheOffline};
     [resultDict setObject:extra forKey:@"extra"];
 
-    NSLog(@"sonic diff result :%@",resultDict);
+    SonicLogEvent(@"sonic diff result :%@",resultDict);
     
     return resultDict;
 }
@@ -692,7 +692,7 @@ - (void)updateDidSuccess
         {
             if (![self.sonicServer isSonicResponse]) {
                 [[SonicCache shareCache] removeCacheBySessionID:self.sessionID];
-                NSLog(@"Clear cache because while not sonic repsonse!");
+                SonicLogEvent(@"Clear cache because while not sonic repsonse!");
                 break;
             }
             
@@ -742,7 +742,7 @@ - (void)updateDidSuccess
                 self.webviewCallBack(resultDict);
             }
         }else{
-            NSLog(@"There is no webViewCallBack!");
+            SonicLogEvent(@"There is no webViewCallBack!");
         }
     }
     
@@ -758,7 +758,7 @@ - (void)dispatchUpdateCallBack
                 self.updateCallBack(resultDict);
             }
         }else{
-            NSLog(@"There is no updateCallBack!");
+            SonicLogEvent(@"There is no updateCallBack!");
         }
     }
 }
@@ -845,7 +845,7 @@ - (void)preloadSubResourceWithResponseHeaders:(NSDictionary *)responseHeaders
 {
     NSString *linkValue = responseHeaders[SonicHeaderKeyLink];
     if (linkValue.length == 0) {
-        NSLog(@"no preload link exist!");
+        SonicLogEvent(@"no preload link exist!");
         return;
     }
     NSArray *linkArray = [linkValue componentsSeparatedByString:@";"];
diff --git a/sonic-iOS/Sonic/Statistics/SonicEventConstants.h b/sonic-iOS/Sonic/Statistics/SonicEventConstants.h
@@ -24,6 +24,9 @@
  *  Sonic Event Type
  */
 typedef NS_ENUM(NSUInteger, SonicStatisticsEvent) {
+    
+    //Throw all step log 
+    SonicStatisticsEvent_EventLog,
 
     //Session create faild
     SonicStatisticsEvent_SessionCreateFaild,
diff --git a/sonic-iOS/Sonic/Statistics/SonicEventStatistics.h b/sonic-iOS/Sonic/Statistics/SonicEventStatistics.h
@@ -20,6 +20,8 @@
 #import <Foundation/Foundation.h>
 #import "SonicEventConstants.h"
 
+#define SonicLogEvent(format,...) [[SonicEventStatistics shareStatistics]addLog:format,##__VA_ARGS__]
+
 @protocol SonicEventStatisticsObserver <NSObject>
 
 - (void)handleEvent:(SonicStatisticsEvent)event withEventInfo:(NSDictionary *)info;
@@ -30,6 +32,8 @@
 
 + (SonicEventStatistics *)shareStatistics;
 
+- (void)addLog:(NSString *)format, ...;
+
 /**
  * Add an observer to handle the events
  */
diff --git a/sonic-iOS/Sonic/Statistics/SonicEventStatistics.m b/sonic-iOS/Sonic/Statistics/SonicEventStatistics.m
@@ -63,6 +63,16 @@ - (void)dealloc
     [super dealloc];
 }
 
+- (void)addLog:(NSString *)format, ...
+{
+    va_list args;
+    va_start(args,format);
+    NSString *logString = [[[NSString alloc]initWithFormat:format arguments:args]autorelease];
+    va_end(args);
+    logString = [NSString stringWithFormat:@"#SonicEventLog# %@",logString];
+    [[SonicEventStatistics shareStatistics] addEvent:SonicStatisticsEvent_EventLog withEventInfo:@{@"logMsg":logString}];
+}
+
 - (void)addEventObserver:(id<SonicEventStatisticsObserver>)eventObserver
 {
     if (![eventObserver conformsToProtocol:@protocol(SonicEventStatisticsObserver)]) {
diff --git a/sonic-iOS/Sonic/Util/SonicUtil.h b/sonic-iOS/Sonic/Util/SonicUtil.h
@@ -21,6 +21,7 @@
 #import "SonicConnection.h"
 #import "SonicConstants.h"
 #import "SonicSession.h"
+#import "SonicEventStatistics.h"
 
 @interface SonicUtil : NSObject
 
diff --git a/sonic-iOS/SonicSample/SonicSample/SonicEventObserver.m b/sonic-iOS/SonicSample/SonicSample/SonicEventObserver.m
@@ -33,8 +33,12 @@ + (NSString *)eventTypeToString:(SonicStatisticsEvent)event
 
 - (void)handleEvent:(SonicStatisticsEvent)event withEventInfo:(NSDictionary *)info
 {
-    NSString *eventString = [SonicEventObserver eventTypeToString:event];
-    NSLog(@"event :%@ info:%@",eventString,info.debugDescription);
+    if (event == SonicStatisticsEvent_EventLog) {
+        NSLog(@"%@",info[@"logMsg"]);
+    }else{
+        NSString *eventString = [SonicEventObserver eventTypeToString:event];
+        SonicLogEvent(@"event :%@ info:%@",eventString,info.debugDescription);
+    }
 }
 
 @end
diff --git a/sonic-iOS/SonicSample/SonicSample/SonicWebViewController.m b/sonic-iOS/SonicSample/SonicSample/SonicWebViewController.m
@@ -43,7 +43,7 @@ - (instancetype)initWithUrl:(NSString *)aUrl useSonicMode:(BOOL)isSonic unStrict
                 SonicSessionConfiguration *configuration = [SonicSessionConfiguration new];
                 NSString *linkValue = @"http://assets.kgc.cn/ff7f069b/css/common-min.www.kgc.css?v=e4ecfe82;http://assets.kgc.cn/ff7f069b/css/themes.www.kgc.css?v=612eb426;http://assets.kgc.cn/ff7f069b/css/style.www.kgc.css?v=05d94f84";
                 configuration.customResponseHeaders = @{
-                                                        SonicHeaderKeyCacheOffline:SonicHeaderValueCacheOfflineStoreRefresh,
+                                                        SonicHeaderKeyCacheOffline:SonicHeaderValueCacheOfflineStore,
                                                         SonicHeaderKeyLink:linkValue
                                                         };
                 configuration.enableLocalServer = YES;

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ - (SonicCacheItem )updateWithJsonData:(NSData )jsonData`
`382`	`382`	`#if DEBUG`
`383`	`383`	`NSAssert(sha1.length>0, errMsg);`
`384`	`384`	`#endif`
`385`		`- NSLog(@"%@",errMsg);`
	`385`	`+ SonicLogEvent(@"%@",errMsg);`
`386`	`386`	`}`
`387`	`387`	`[config setObject:sha1 forKey:kSonicSha1];`
`388`	`388`	`cacheItem.config = config;`
`@@ -799,10 +799,10 @@ - (void)checkAndTrimRootCache`
`799`	`799`	`unsigned long long lastTrimStamp = [[[NSUserDefaults standardUserDefaults] objectForKey:kSonicRootCacheTrimTimestampUDF] longLongValue];`
`800`	`800`	`unsigned long long duration = currentTimeStamp() - lastTrimStamp;`
`801`	`801`	`if (duration < [SonicConfiguration defaultConfiguration].rootCacheSizeCheckDuration) {`
`802`		`- NSLog(@"Trim root cache in duration!");`
	`802`	`+ SonicLogEvent(@"Trim root cache in duration!");`
`803`	`803`	`return;`
`804`	`804`	`}`
`805`		`- NSLog(@"Trim root cache start !");`
	`805`	`+ SonicLogEvent(@"Trim root cache start !");`
`806`	`806`	`[self checkAndTrimCacheAtDirPath:_rootCachePath unIncludeSubDir:SonicRootCacheConfigDirName withMaxDirectorySize:[SonicConfiguration defaultConfiguration].cacheMaxDirectorySize withWarningPercent:[SonicConfiguration defaultConfiguration].cacheDirectorySizeWarningPercent];`
`807`	`807`	`[[NSUserDefaults standardUserDefaults] setObject:[@(currentTimeStamp()) stringValue] forKey:kSonicRootCacheTrimTimestampUDF];`
`808`	`808`	`}`
`@@ -876,7 +876,7 @@ - (void)checkAndTrimCacheAtDirPath:(NSString *)dirPath unIncludeSubDir:(NSString`
`876`	`876`
`877`	`877`	`[SonicFileManager removeItemAtPath:subDir error:nil];`
`878`	`878`
`879`		`- NSLog(@"trim clear cache at subDir :%@",subDir);`
	`879`	`+ SonicLogEvent(@"trim clear cache at subDir :%@",subDir);`
`880`	`880`	`}`
`881`	`881`	`}`
`882`	`882`
`@@ -927,7 +927,7 @@ - (BOOL)setupSubResourceCacheDirectory`
`927`	`927`
`928`	`928`	`_rootResourceCachePath = [[self createDirectoryIfNotExist:[paths objectAtIndex:0] withSubPath:SonicResourceCacheDirName] copy];`
`929`	`929`
`930`		`- NSLog(@"resource cache path:%@",_rootResourceCachePath);`
	`930`	`+ SonicLogEvent(@"resource cache path:%@",_rootResourceCachePath);`
`931`	`931`
`932`	`932`	`[self setupSubResourceConfigDirectory];`
`933`	`933`
`@@ -971,7 +971,7 @@ - (BOOL)saveSubResourceData:(NSData )data withConfig:(NSDictionary )config wit`
`971`	`971`	`[SonicFileManager removeItemAtPath:cacheFilePath error:nil];`
`972`	`972`	`}`
`973`	`973`
`974`		`- NSLog(@"resource save state:%d sessionID:%@",isSuccess,sessionID);`
	`974`	`+ SonicLogEvent(@"resource save state:%d sessionID:%@",isSuccess,sessionID);`
`975`	`975`
`976`	`976`	`return isSuccess;`
`977`	`977`	`}`
`@@ -1010,7 +1010,7 @@ - (void)checkAndTrimResourceCache`
`1010`	`1010`	`unsigned long long lastTrimStamp = [[[NSUserDefaults standardUserDefaults] objectForKey:kSonicResourceCacheTrimTimestampUDF] longLongValue];`
`1011`	`1011`	`unsigned long long duration = currentTimeStamp() - lastTrimStamp;`
`1012`	`1012`	`if (duration < [SonicConfiguration defaultConfiguration].resourceCacheSizeCheckDuration) {`
`1013`		`- NSLog(@"Trim resource cache in duration!");`
	`1013`	`+ SonicLogEvent(@"Trim resource cache in duration!");`
`1014`	`1014`	`return;`
`1015`	`1015`	`}`
`1016`	`1016`	`//event`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`
`20`	`20`	`#import "SonicDatabase.h"`
`21`	`21`	`#import "sqlite3.h"`
	`22`	`+#import "SonicEventStatistics.h"`
`22`	`23`
`23`	`24`	`#if __has_feature(objc_arc)`
`24`	`25`	`#error This file must be compiled without ARC. Use -fno-objc-arc flag.`
`@@ -47,7 +48,7 @@ - (instancetype)initWithPath:(NSString *)dbPath`
`47`	`48`
`48`	`49`	`if (ret != SQLITE_OK) {`
`49`	`50`
`50`		`- NSLog(@"database open db faild :%@ code:%d",dbPath,ret);`
	`51`	`+ SonicLogEvent(@"database open db faild :%@ code:%d",dbPath,ret);`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`[self createConfigTableIfNotExist];`
`@@ -80,7 +81,7 @@ - (BOOL)execSql:(NSString *)sql`
`80`	`81`
`81`	`82`	`int ret = sqlite3_exec(_db, sql.UTF8String, NULL, NULL, NULL);`
`82`	`83`	`if (ret != SQLITE_OK) {`
`83`		`- NSLog(@"sql error:%@",sql);`
	`84`	`+ SonicLogEvent(@"sql error:%@",sql);`
`84`	`85`	`}`
`85`	`86`	`return ret == SQLITE_OK;`
`86`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ - (NSDictionary *)sonicItemForCache`
`299`	`299`	`}`
`300`	`300`	`return nil;`
`301`	`301`	`}`
`302`		`- NSLog(@"sonicItemForCache warning:Should never call this function before connection did completion!");`
	`302`	`+ SonicLogEvent(@"sonicItemForCache warning:Should never call this function before connection did completion!");`
`303`	`303`	`return nil;`
`304`	`304`	`}`
`305`	`305`
`@@ -407,7 +407,7 @@ - (void)connectionDidCompleteWithoutError:(SonicConnection *)connection`
`407`	`407`
`408`	`408`	`//if http status is 304, there is nothing changed`
`409`	`409`	`if (self.response.statusCode == 304) {`
`410`		`- NSLog(@"response status 304!");`
	`410`	`+ SonicLogEvent(@"Response status 304!");`
`411`	`411`	`break;`
`412`	`412`	`}`
`413`	`413`
Original file line number	Diff line number	Diff line change
`@@ -40,15 +40,15 @@ + (BOOL)canInitWithRequest:(NSURLRequest *)request`
`40`	`40`	`if (session && [sessionID isEqualToString:session.sessionID]) {`
`41`	`41`	`return YES;`
`42`	`42`	`}`
`43`		`- NSLog(@"SonicURLProtocol.canInitWithRequest error:Cannot find sonic session!");`
	`43`	`+ SonicLogEvent(@"SonicURLProtocol.canInitWithRequest error:Cannot find sonic session!");`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`//Sub resource intercept`
`48`	`48`	`NSString * sessionID = sonicSessionID(request.mainDocumentURL.absoluteString);`
`49`	`49`	`SonicSession *session = [[SonicEngine sharedEngine] sessionById:sessionID];`
`50`	`50`	`if (session.resourceLoader && [session.resourceLoader canInterceptResourceWithUrl:request.URL.absoluteString]) {`
`51`		`- NSLog(@"SonicURLProtocol resource should intercept:%@",request.debugDescription);`
	`51`	`+ SonicLogEvent(@"SonicURLProtocol resource should intercept:%@",request.debugDescription);`
`52`	`52`	`return YES;`
`53`	`53`	`}`
`54`	`54`
`@@ -71,7 +71,7 @@ - (void)startLoading`
`71`	`71`
`72`	`72`	`if ([session.resourceLoader canInterceptResourceWithUrl:self.request.URL.absoluteString]) {`
`73`	`73`
`74`		`- NSLog(@"protocol resource did start loading :%@",self.request.debugDescription);`
	`74`	`+ SonicLogEvent(@"protocol resource did start loading :%@",self.request.debugDescription);`
`75`	`75`
`76`	`76`	`SonicSession *session = [[SonicEngine sharedEngine] sessionById:sessionID];`
`77`	`77`
`@@ -118,14 +118,14 @@ - (void)callClientActionWithParams:(NSDictionary *)params`
`118`	`118`	`NSData *recvData = params[kSonicProtocolData];`
`119`	`119`	`if (recvData.length > 0) {`
`120`	`120`	`[self.client URLProtocol:self didLoadData:recvData];`
`121`		`- NSLog(@"protocol did load data length:%ld",recvData.length);`
	`121`	`+ SonicLogEvent(@"protocol did load data length:%ld",recvData.length);`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`	`break;`
`125`	`125`	`case SonicURLProtocolActionDidSuccess:`
`126`	`126`	`{`
`127`	`127`	`[self.client URLProtocolDidFinishLoading:self];`
`128`		`- NSLog(@"protocol did finish loading request:%@",self.request.debugDescription);`
	`128`	`+ SonicLogEvent(@"protocol did finish loading request:%@",self.request.debugDescription);`
`129`	`129`	`}`
`130`	`130`	`break;`
`131`	`131`	`case SonicURLProtocolActionDidFaild:`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ - (void)start`
`184`	`184`	`if (self.configuration.supportCacheControl) {`
`185`	`185`	`SonicCacheItem *cacheItem = [[SonicCache shareCache] cacheForSession:self.sessionID];`
`186`	`186`	`if (![cacheItem isCacheExpired]) {`
`187`		`- NSLog(@"SonicSession.start finish:session(%@) is under cache expired.", self.sessionID);`
	`187`	`+ SonicLogEvent(@"SonicSession.start finish:session(%@) is under cache expired.", self.sessionID);`
`188`	`188`	`return;`
`189`	`189`	`}`
`190`	`190`	`}`
`@@ -435,7 +435,7 @@ - (void)firstLoadDidSuccess`
`435`	`435`	`if (200 == self.sonicServer.response.statusCode) {`
`436`	`436`	`[self dealWithFirstLoad];`
`437`	`437`	`} else {`
`438`		`- NSLog(@"firstLoadDidSuccess warning:statusCode[%ld] miss!", (long)self.sonicServer.response.statusCode);`
	`438`	`+ SonicLogEvent(@"firstLoadDidSuccess warning:statusCode[%ld] miss!", (long)self.sonicServer.response.statusCode);`
`439`	`439`	`}`
`440`	`440`
`441`	`441`	`[self checkAutoCompletionAction];`
`@@ -464,7 +464,7 @@ - (void)dealWithFirstLoad`
`464`	`464`	`if (self.configuration.supportCacheControl) {`
`465`	`465`	`NSString *cacheControl = [self.sonicServer responseHeaderForKey:SonicHeaderValueCacheControl];`
`466`	`466`	`if ([cacheControl isEqualToString:@"no-cache"] \|\| [cacheControl isEqualToString:@"no-store"] \|\| [cacheControl isEqualToString:@"must-revalidate"]) {`
`467`		`- NSLog(@"cache control need't cache!");`
	`467`	`+ SonicLogEvent(@"cache control need't cache!");`
`468`	`468`	`return;`
`469`	`469`	`}`
`470`	`470`	`}`
`@@ -473,7 +473,7 @@ - (void)dealWithFirstLoad`
`473`	`473`
`474`	`474`	`NSDictionary *serverResult = [self.sonicServer sonicItemForCache];`
`475`	`475`	`if (!serverResult) {`
`476`		`- NSLog(@"Sonic first load item for cache nil");`
	`476`	`+ SonicLogEvent(@"Sonic first load item for cache nil");`
`477`	`477`	`return;`
`478`	`478`	`}`
`479`	`479`
`@@ -668,7 +668,7 @@ - (NSDictionary *)sonicDiffResult`
`668`	`668`	`NSDictionary *extra = @{@"template-tag":templateTag,@"eTag":etag,@"isReload":isRefresh,@"cache-offline":cacheOffline};`
`669`	`669`	`[resultDict setObject:extra forKey:@"extra"];`
`670`	`670`
`671`		`- NSLog(@"sonic diff result :%@",resultDict);`
	`671`	`+ SonicLogEvent(@"sonic diff result :%@",resultDict);`
`672`	`672`
`673`	`673`	`return resultDict;`
`674`	`674`	`}`
`@@ -692,7 +692,7 @@ - (void)updateDidSuccess`
`692`	`692`	`{`
`693`	`693`	`if (![self.sonicServer isSonicResponse]) {`
`694`	`694`	`[[SonicCache shareCache] removeCacheBySessionID:self.sessionID];`
`695`		`- NSLog(@"Clear cache because while not sonic repsonse!");`
	`695`	`+ SonicLogEvent(@"Clear cache because while not sonic repsonse!");`
`696`	`696`	`break;`
`697`	`697`	`}`
`698`	`698`
`@@ -742,7 +742,7 @@ - (void)updateDidSuccess`
`742`	`742`	`self.webviewCallBack(resultDict);`
`743`	`743`	`}`
`744`	`744`	`}else{`
`745`		`- NSLog(@"There is no webViewCallBack!");`
	`745`	`+ SonicLogEvent(@"There is no webViewCallBack!");`
`746`	`746`	`}`
`747`	`747`	`}`
`748`	`748`
`@@ -758,7 +758,7 @@ - (void)dispatchUpdateCallBack`
`758`	`758`	`self.updateCallBack(resultDict);`
`759`	`759`	`}`
`760`	`760`	`}else{`
`761`		`- NSLog(@"There is no updateCallBack!");`
	`761`	`+ SonicLogEvent(@"There is no updateCallBack!");`
`762`	`762`	`}`
`763`	`763`	`}`
`764`	`764`	`}`
`@@ -845,7 +845,7 @@ - (void)preloadSubResourceWithResponseHeaders:(NSDictionary *)responseHeaders`
`845`	`845`	`{`
`846`	`846`	`NSString *linkValue = responseHeaders[SonicHeaderKeyLink];`
`847`	`847`	`if (linkValue.length == 0) {`
`848`		`- NSLog(@"no preload link exist!");`
	`848`	`+ SonicLogEvent(@"no preload link exist!");`
`849`	`849`	`return;`
`850`	`850`	`}`
`851`	`851`	`NSArray *linkArray = [linkValue componentsSeparatedByString:@";"];`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,12 @@ + (NSString *)eventTypeToString:(SonicStatisticsEvent)event`
`33`	`33`
`34`	`34`	`- (void)handleEvent:(SonicStatisticsEvent)event withEventInfo:(NSDictionary *)info`
`35`	`35`	`{`
`36`		`- NSString *eventString = [SonicEventObserver eventTypeToString:event];`
`37`		`- NSLog(@"event :%@ info:%@",eventString,info.debugDescription);`
	`36`	`+ if (event == SonicStatisticsEvent_EventLog) {`
	`37`	`+ NSLog(@"%@",info[@"logMsg"]);`
	`38`	`+ }else{`
	`39`	`+ NSString *eventString = [SonicEventObserver eventTypeToString:event];`
	`40`	`+ SonicLogEvent(@"event :%@ info:%@",eventString,info.debugDescription);`
	`41`	`+ }`
`38`	`42`	`}`
`39`	`43`
`40`	`44`	`@end`