Cleaned up logs.

Author: alda-optimizely

OptimizelySDKCore/OptimizelySDKCore/OPTLYLoggerMessages.h

@@ -133,6 +133,17 @@ extern NSString *const OPTLYLoggerMessagesUserProfileRemoveVariationNotFound;
 extern NSString *const OPTLYLoggerMessagesBucketerSavingUserData;
 extern NSString *const OPTLYLoggerMessagesBucketerUserDataRetrieved;
 
+// ---- Datafile Nanager ----
+// Info
+extern NSString *const OPTLYLoggerMessagesDatafileManagerDatafileDownloading;
+extern NSString *const OPTLYLoggerMessagesDatafileManagerDatafileDownloaded;
+// Debug
+extern NSString *const OPTLYLoggerMessagesDatafileManagerLastModifiedDate;
+extern NSString *const OPTLYLoggerMessagesDatafileManagerDatafileNotDownloadedNoChanges;
+extern NSString *const OPTLYLoggerMessagesDatafileManagerDatafileNotDownloadedError;
+extern NSString *const OPTLYLoggerMessagesDatafileManagerLastModifedDate;
+extern NSString *const OPTLYLoggerMessagesDatafileManagerLastModifedDateNotFound;
+
 @interface OPTLYLoggerMessages : NSObject
 
 @end

OptimizelySDKCore/OptimizelySDKCore/OPTLYLoggerMessages.m

@@ -133,6 +133,17 @@
 NSString *const OPTLYLoggerMessagesBucketerSavingUserData = @"Saving bucketing data for user: %@, experiment: %@, variation: %@.";
 NSString *const OPTLYLoggerMessagesBucketerUserDataRetrieved = @"Retrieved bucketing data for user: %@, experiment: %@, variation: %@.";
 
+// ---- Datafile Nanager ----
+// Info
+NSString *const OPTLYLoggerMessagesDatafileManagerDatafileDownloading = @"[DATAFILE MANAGER] Downloading datafile for project %@.";
+NSString *const OPTLYLoggerMessagesDatafileManagerDatafileDownloaded = @"[DATAFILE MANAGER] Datafile for project %@ downloaded. Saving datafile and last modified date: %@.";
+// Debug
+NSString *const OPTLYLoggerMessagesDatafileManagerLastModifiedDate = @"[DATAFILE MANAGER] Datafile was last modified on %@.";
+NSString *const OPTLYLoggerMessagesDatafileManagerDatafileNotDownloadedNoChanges = @"[DATAFILE MANAGER] Datafile for project %@ NOT downloaded. No datafile changes have been made.";
+NSString *const OPTLYLoggerMessagesDatafileManagerDatafileNotDownloadedError = @"[DATAFILE MANAGER] Datafile for project %@ NOT downloaded. Error received: %@.";
+NSString *const OPTLYLoggerMessagesDatafileManagerLastModifedDate = @"[DATAFILE MANAGER] Last modified date %@ found for project %@.";
+NSString *const OPTLYLoggerMessagesDatafileManagerLastModifedDateNotFound = @"[DATAFILE MANAGER] Last modified date not found for project %@.";
+
 @implementation OPTLYLoggerMessages
 
 @end

OptimizelySDKDatafileManager/OptimizelySDKDatafileManager/OPTLYDatafileManager.m

@@ -62,28 +62,46 @@ - (instancetype)initWithBuilder:(OPTLYDatafileManagerBuilder *)builder {
 }
 
 - (void)downloadDatafile:(NSString *)projectId completionHandler:(OPTLYHTTPRequestManagerResponse)completion {
-    OPTLYLogInfo(@"Downloading datafile: %@", projectId);
+    NSString *logMessage = [NSString stringWithFormat:OPTLYLoggerMessagesDatafileManagerDatafileDownloading, projectId];
+    [self.logger logMessage:logMessage withLevel:OptimizelyLogLevelInfo];
 
     NSString *lastSavedModifiedDate = [self getLastModifiedDate:projectId];
+    logMessage = [NSString stringWithFormat:OPTLYLoggerMessagesDatafileManagerLastModifiedDate, lastSavedModifiedDate];
+    [self.logger logMessage:logMessage withLevel:OptimizelyLogLevelDebug];
+    
     [self.networkService downloadProjectConfig:self.projectId
                                   lastModified:lastSavedModifiedDate
                              completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
+         NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
+         NSInteger statusCode = [httpResponse statusCode];
+         NSString *logMessage = @"";
          if (error != nil) {
              [self.errorHandler handleError:error];
          }
-         else if ([(NSHTTPURLResponse *)response statusCode] == 200) { // got datafile OK
+         else if (statusCode == 200) { // got datafile OK
              [self saveDatafile:data];
 
              // save the last modified date
-             NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
+             
              NSDictionary *dictionary = [httpResponse allHeaderFields];
              NSString *lastModifiedDate = [dictionary valueForKey:@"Last-Modified"];
              [self saveLastModifiedDate:lastModifiedDate project:projectId];
-             OPTLYLogInfo(@"Datafile for project ID %@ downloaded. Saving datafile and last modified date: %@", lastModifiedDate);
+             
+             logMessage = [NSString stringWithFormat:OPTLYLoggerMessagesDatafileManagerDatafileDownloaded, projectId, lastModifiedDate];
+             [self.logger logMessage:logMessage withLevel:OptimizelyLogLevelInfo];
+         }
+         else if (statusCode == 304) {
+              logMessage = [NSString stringWithFormat:OPTLYLoggerMessagesDatafileManagerDatafileNotDownloadedNoChanges, projectId];
+              [self.logger logMessage:logMessage withLevel:OptimizelyLogLevelDebug];
          }
          else {
              // TODO: Josh W. handle bad response
+             logMessage = [NSString stringWithFormat:OPTLYLoggerMessagesDatafileManagerDatafileNotDownloadedError, projectId, error];
+            [self.logger logMessage:logMessage withLevel:OptimizelyLogLevelDebug];
          }
+                                 
+       
+                                 
          // call the completion handler
          if (completion != nil) {
              completion(data, response, error);
@@ -126,9 +144,9 @@ - (nullable NSString *)getLastModifiedDate:(nonnull NSString *)projectId {
 
     NSString *logMessage = @"";
     if ([lastModifiedDate length]) {
-        logMessage = [NSString stringWithFormat:@"[DATAFILE MANAGER] Last modified date %@ found for project %@.", lastModifiedDate, projectId];
+        logMessage = [NSString stringWithFormat:OPTLYLoggerMessagesDatafileManagerLastModifedDate, lastModifiedDate, projectId];
     } else {
-        logMessage = [NSString stringWithFormat:@"[DATAFILE MANAGER] Last modified date not found for project %@.", projectId];
+        logMessage = [NSString stringWithFormat:OPTLYLoggerMessagesDatafileManagerLastModifedDateNotFound, projectId];
     }
     [self.logger logMessage:logMessage withLevel:OptimizelyLogLevelDebug];
 

OptimizelySDKShared/OptimizelySDKShared/OPTLYHTTPRequestManager.m

@@ -102,12 +102,6 @@ - (void)GETIfModifiedSince:(nonnull NSString *)lastModifiedDate
 
     NSURLSession *ephemeralSession = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration ephemeralSessionConfiguration]];
     NSURLSessionDataTask *dataTask = [ephemeralSession dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
-        NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
-    
-        int responseCode = (int)[httpResponse statusCode];
-        OPTLYLogInfo(@"All headers: %@", [httpResponse allHeaderFields]);
-        OPTLYLogInfo(@"Status code:: %d", responseCode);
-        
         if (completion) {
             completion(data, response, error);
         }