modify rotate way.

Author: yu li

flume-ng-core/src/main/java/org/apache/flume/formatter/output/RollTimePathManager.java

@@ -25,13 +25,17 @@
 import org.joda.time.LocalDateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
  */
 public class RollTimePathManager extends DefaultPathManager {
 
-    private final DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyyMMddHHmmss");
+    private static final Logger logger = LoggerFactory
+      .getLogger(RollTimePathManager.class);
+    private final DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd");
     private String lastRoll;
 
     public RollTimePathManager(Context context) {
@@ -46,13 +50,16 @@ public File nextFile() {
             getFileIndex().set(0);
             lastRoll = date;
         }
-        sb.append(getPrefix()).append(date).append("-");
-        sb.append(getFileIndex().incrementAndGet());
+        sb.append(getPrefix());//.append("-");
+        int i= getFileIndex().incrementAndGet();
+        if ( i > 1) {
+            sb.append(date);
+            sb.append("-"+(i-1));
+        }
         if (getExtension().length() > 0) {
             sb.append(".").append(getExtension());
         }
         currentFile = new File(getBaseDirectory(), sb.toString());
-
         return currentFile;
     }