Add oldest rotation type option to RTCFileLogger

talk/app/webrtc/objc/RTCFileLogger.mm

 /*
  * libjingle
  * Copyright 2015 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 17 matching lines @@
 #import "RTCFileLogger.h"
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/filerotatingstream.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/logsinks.h"
 #include "webrtc/base/scoped_ptr.h"
 
 NSString *const kDefaultLogDirName = @"webrtc_logs";
 NSUInteger const kDefaultMaxFileSize = 10 * 1024 * 1024; // 10MB.
+const char *kRTCFileLoggerRotatingLogPrefix = "rotating_log";
 
 @implementation RTCFileLogger {
   BOOL _hasStarted;
   NSString *_dirPath;
   NSUInteger _maxFileSize;
-  rtc::scoped_ptr<rtc::CallSessionFileRotatingLogSink> _logSink;
+  rtc::scoped_ptr<rtc::FileRotatingLogSink> _logSink;
 }
 
 @synthesize severity = _severity;
+@synthesize rotationType = _rotationType;
 
 - (instancetype)init {
   NSArray *paths = NSSearchPathForDirectoriesInDomains(
       NSDocumentDirectory, NSUserDomainMask, YES);
   NSString *documentsDirPath = [paths firstObject];
   NSString *defaultDirPath =
       [documentsDirPath stringByAppendingPathComponent:kDefaultLogDirName];
   return [self initWithDirPath:defaultDirPath
                    maxFileSize:kDefaultMaxFileSize];
 }
 
 - (instancetype)initWithDirPath:(NSString *)dirPath
                     maxFileSize:(NSUInteger)maxFileSize {
+  return [self initWithDirPath:dirPath
+                   maxFileSize:maxFileSize
+                  rotationType:kRTCFileLoggerRotationTypeMiddle];
+}
+
+- (instancetype)initWithDirPath:(NSString *)dirPath
+                    maxFileSize:(NSUInteger)maxFileSize
+                   rotationType:(RTCFileLoggerRotationType)rotationType {
   NSParameterAssert(dirPath.length);
   NSParameterAssert(maxFileSize);
   if (self = [super init]) {
     BOOL isDir = NO;
     NSFileManager *fileManager = [NSFileManager defaultManager];
     if ([fileManager fileExistsAtPath:dirPath isDirectory:&isDir]) {
       if (!isDir) {
         // Bail if something already exists there.
         return nil;
       }
@@ skipping 14 matching lines @@
 }
 
 - (void)dealloc {
   [self stop];
 }
 
 - (void)start {
   if (_hasStarted) {
     return;
   }
-  _logSink.reset(new rtc::CallSessionFileRotatingLogSink(_dirPath.UTF8String,
-                                                         _maxFileSize));
+  if (_rotationType == kRTCFileLoggerRotationTypeOldest) {

[tkchin_webrtc, 2015/11/16 21:37:25]

use a switch here so we don't miss it if we add new stuff

[Chuck, 2015/12/04 22:42:57]

Done.

+    _logSink.reset(new rtc::FileRotatingLogSink(_dirPath.UTF8String,
+                                                kRTCFileLoggerRotatingLogPrefix,

[tkchin_webrtc, 2015/11/16 21:37:25]

suggest using different prefixes for the different types
just to avoid potential situation where you open RTCFileLogger on the same dir
with a different type

[Chuck, 2015/12/04 22:42:57]

It isn't immediately obvious, but they do use different prefixes. The one for
the CallSession log is defined in CallSessionFileRotatingStream as:
const char* CallSessionFileRotatingStream::kLogPrefix = "webrtc_log";

+                                                _maxFileSize,
+                                                _maxFileSize / 10));
+  } else {
+    _logSink.reset(new rtc::CallSessionFileRotatingLogSink(_dirPath.UTF8String,
+                                                           _maxFileSize));
+  }
   if (!_logSink->Init()) {
     LOG(LS_ERROR) << "Failed to open log files at path: "
                   << _dirPath.UTF8String;
     _logSink.reset();
     return;
   }
   rtc::LogMessage::LogThreads(true);
   rtc::LogMessage::LogTimestamps(true);
   rtc::LogMessage::AddLogToStream(_logSink.get(), [self rtcSeverity]);
   _hasStarted = YES;
 }
 
 - (void)stop {
   if (!_hasStarted) {
     return;
   }
   RTC_DCHECK(_logSink);
   rtc::LogMessage::RemoveLogToStream(_logSink.get());
   _hasStarted = NO;
   _logSink.reset();
 }
 
 - (NSData *)logData {
   if (_hasStarted) {
     return nil;
   }
   NSMutableData* logData = [NSMutableData data];
-  rtc::scoped_ptr<rtc::CallSessionFileRotatingStream> stream(
-      new rtc::CallSessionFileRotatingStream(_dirPath.UTF8String));
+  rtc::scoped_ptr<rtc::FileRotatingStream> stream;
+  if (_rotationType == kRTCFileLoggerRotationTypeOldest) {

[tkchin_webrtc, 2015/11/16 21:37:25]

ditto switch

[Chuck, 2015/12/04 22:42:57]

Done.

+    stream.reset(new rtc::FileRotatingStream(_dirPath.UTF8String,
+                                             kRTCFileLoggerRotatingLogPrefix));
+  } else {
+    stream.reset(new rtc::CallSessionFileRotatingStream(_dirPath.UTF8String));
+  }
   if (!stream->Open()) {
     return logData;
   }
   size_t bufferSize = 0;
   if (!stream->GetSize(&bufferSize) || bufferSize == 0) {
     return logData;
   }
   size_t read = 0;
   // Allocate memory using malloc so we can pass it direcly to NSData without
   // copying.
@@ skipping 13 matching lines @@
     case kRTCFileLoggerSeverityInfo:
       return rtc::LS_INFO;
     case kRTCFileLoggerSeverityWarning:
       return rtc::LS_WARNING;
     case kRTCFileLoggerSeverityError:
       return rtc::LS_ERROR;
   }
 }
 
 @end