Merge branch 'charlesmchen/logOverflow'

Podfile.lock

@@ -134,7 +134,7 @@ CHECKOUT OPTIONS:
     :commit: 521686c112bbae7a762f85d52b1e41eeb1760772
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
   SignalServiceKit:
-    :commit: 4609c508ec51c69af171ea227eca7ac010f065d5
+    :commit: 8b04e2a880bf31533c17359657ad9ae8a4db0d3d
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf

Signal/src/ViewControllers/ConversationView/MessagesViewController.m

@@ -3592,7 +3592,7 @@ typedef enum : NSUInteger {
 {
     OWSAssert([NSThread isMainThread]);
 
-    DDLogInfo(@"cancelRecordingVoiceMemo");
+    DDLogDebug(@"cancelRecordingVoiceMemo");
 
     [self resetRecordingVoiceMemo];
 }

Signal/src/environment/DebugLogger.m

@@ -1,9 +1,5 @@
 //
-//  DebugLogger.m
-//  Signal
-//
-//  Created by Frederic Jacobs on 08/08/14.
-//  Copyright (c) 2014 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugLogger.h"
@@ -30,10 +26,14 @@
 
 
 - (void)enableFileLogging {
-    self.fileLogger = [[DDFileLogger alloc]
-        init]; // Logging to file, because it's in the Cache folder, they are not uploaded in iTunes/iCloud backups.
-    self.fileLogger.rollingFrequency                       = 60 * 60 * 24; // 24 hour rolling.
-    self.fileLogger.logFileManager.maximumNumberOfLogFiles = 3;            // Keep three days of logs.
+    // Logging to file, because it's in the Cache folder, they are not uploaded in iTunes/iCloud backups.
+    self.fileLogger = [DDFileLogger new];
+    // 24 hour rolling.
+    self.fileLogger.rollingFrequency = 60 * 60 * 24;
+    // Keep last 3 days of logs - or last 3 logs (if logs rollover due to max file size).
+    self.fileLogger.logFileManager.maximumNumberOfLogFiles = 3;
+    // Raise the max file size per log file to 3 MB.
+    self.fileLogger.maximumFileSize = 1024 * 1024 * 3;
     self.fileLogger.logFormatter = [OWSScrubbingLogFormatter new];
 
     [DDLog addLogger:self.fileLogger];