[prev in list] [next in list] [prev in thread] [next in thread] 

List:       flume-commits
Subject:    svn commit: r1342066 - in /incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/
From:       juhanic () apache ! org
Date:       2012-05-23 21:39:38
Message-ID: 20120523213939.15B58238897A () eris ! apache ! org
[Download RAW message or body]

Author: juhanic
Date: Wed May 23 21:39:38 2012
New Revision: 1342066

URL: http://svn.apache.org/viewvc?rev=1342066&view=rev
Log:
FLUME-1194 RecoverableMemoryChannel prop misspelled -- "rentention" should be \
"retention"

(Juhani Connolly)


Modified:
    incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src/main/java/org/apache/flume/channel/recoverable/memory/RecoverableMemoryChannel.java
  incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src/main/java/org/apache/flume/channel/recoverable/memory/wal/WAL.java


Modified: incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src \
                /main/java/org/apache/flume/channel/recoverable/memory/RecoverableMemoryChannel.java
                
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-channels/flume-recove \
rable-memory-channel/src/main/java/org/apache/flume/channel/recoverable/memory/RecoverableMemoryChannel.java?rev=1342066&r1=1342065&r2=1342066&view=diff
 ==============================================================================
--- incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src/main/java/org/apache/flume/channel/recoverable/memory/RecoverableMemoryChannel.java \
                (original)
+++ incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src/main/java/org/apache/flume/channel/recoverable/memory/RecoverableMemoryChannel.java \
Wed May 23 21:39:38 2012 @@ -59,7 +59,7 @@ public class RecoverableMemoryChannel ex
   public static final String WAL_DATA_DIR = "wal.dataDir";
   public static final String WAL_ROLL_SIZE = "wal.rollSize";
   public static final String WAL_MAX_LOGS_SIZE = "wal.maxLogsSize";
-  public static final String WAL_MIN_RENTENTION_PERIOD = "wal.minRententionPeriod";
+  public static final String WAL_MIN_RETENTION_PERIOD = "wal.minRetentionPeriod";
   public static final String WAL_WORKER_INTERVAL = "wal.workerInterval";
   public static final String CAPACITY = "capacity";
   public static final String KEEPALIVE = "keep-alive";
@@ -101,7 +101,7 @@ public class RecoverableMemoryChannel ex
     keepAlive = context.getInteger(KEEPALIVE, DEFAULT_KEEPALIVE);
     long rollSize = context.getLong(WAL_ROLL_SIZE, WAL.DEFAULT_ROLL_SIZE);
     long maxLogsSize = context.getLong(WAL_MAX_LOGS_SIZE, \
                WAL.DEFAULT_MAX_LOGS_SIZE);
-    long minLogRetentionPeriod = context.getLong(WAL_MIN_RENTENTION_PERIOD, \
WAL.DEFAULT_MIN_LOG_RENTENTION_PERIOD); +    long minLogRetentionPeriod = \
                context.getLong(WAL_MIN_RETENTION_PERIOD, \
                WAL.DEFAULT_MIN_LOG_RETENTION_PERIOD);
     long workerInterval = context.getLong(WAL_WORKER_INTERVAL, \
WAL.DEFAULT_WORKER_INTERVAL);  if(wal == null) {
       String homePath = System.getProperty("user.home").replace('\\', '/');

Modified: incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src/main/java/org/apache/flume/channel/recoverable/memory/wal/WAL.java
                
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-channels/flume-recove \
rable-memory-channel/src/main/java/org/apache/flume/channel/recoverable/memory/wal/WAL.java?rev=1342066&r1=1342065&r2=1342066&view=diff
 ==============================================================================
--- incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src/main/java/org/apache/flume/channel/recoverable/memory/wal/WAL.java \
                (original)
+++ incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src/main/java/org/apache/flume/channel/recoverable/memory/wal/WAL.java \
Wed May 23 21:39:38 2012 @@ -105,7 +105,7 @@ public class WAL<T extends Writable> imp
   /**
    * Minimum number of ms to keep a log file.
    */
-  public static final long DEFAULT_MIN_LOG_RENTENTION_PERIOD = 5L * 60L * 1000L;
+  public static final long DEFAULT_MIN_LOG_RETENTION_PERIOD = 5L * 60L * 1000L;
   /**
    * How often in ms the background worker runs
    */
@@ -114,7 +114,7 @@ public class WAL<T extends Writable> imp
   // used for testing only
   WAL(File path, Class<T> clazz) throws IOException {
     this(path, clazz, DEFAULT_ROLL_SIZE, DEFAULT_MAX_LOGS_SIZE,
-        DEFAULT_MIN_LOG_RENTENTION_PERIOD, DEFAULT_WORKER_INTERVAL);
+        DEFAULT_MIN_LOG_RETENTION_PERIOD, DEFAULT_WORKER_INTERVAL);
   }
 
   /**


[prev in list] [next in list] [prev in thread] [next in thread]