v1.0.0开发：日志扩容策略开发

demo/src/main/java/com/dolin/demo/DemoApplication.kt

@@ -30,6 +30,7 @@ class DemoApplication : Application() {
                 //缓存文件的过期时间
                 .setOverdueDay(3)
                 .setFileSizeLimitDay(1)
+                .setRecordCompressEnable(false)
                 .create()
         Zap.initialize(this, config)
     }

library_comm/CMakeLists.txt

@@ -12,7 +12,6 @@ cmake_minimum_required(VERSION 3.4.1)
 
 #设置库文件的输出目录
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../soLibs/comm/${ANDROID_ABI})
-#message(------ ${PROJECT_SOURCE_DIR}/../lib ------)
 
 include_directories(src/main/cpp/buffer)
 include_directories(src/main/cpp/kit)

library_comm/src/main/cpp/buffer/buffer.cpp

@@ -11,7 +11,7 @@ Buffer::~Buffer() {
     Release();
 }
 
-void Buffer::InitData(char *log_path, size_t log_path_len, bool _compress, size_t _limit_size) {
+void Buffer::InitData(char *log_path, size_t log_path_len, size_t limit_size, bool _compress) {
     std::lock_guard<std::recursive_mutex> lck_release(log_mtx);
     memset(buffer_ptr, '\0', buffer_size);
 
@@ -20,12 +20,11 @@ void Buffer::InitData(char *log_path, size_t log_path_len, bool _compress, size_
     header.log_path_len = log_path_len;
     header.log_path = log_path;
     header.log_len = 0;
+    header.limit_size = limit_size;
     header.compress = _compress;
-    header.limit_size = _limit_size;
 
     buffer_header.InitHeader(header);
     InitCompress(_compress);
-    limit_size = _limit_size;
 
     data_ptr = (char *) buffer_header.GetDataPtr();
     write_ptr = (char *) buffer_header.GetWritePtr();
@@ -128,11 +127,12 @@ void Buffer::CallFileFlush(FileFlush *flush, Buffer *buffer) {
     }
 }
 
-void Buffer::ChangeLogPath(char *path) {
+void Buffer::ExpLogPath(char *path, size_t limit_size) {
     if (log_file_ptr != nullptr) {
         CallFileFlush();
     }
-    InitData(path, strlen(path), compress, limit_size);
+    InitData(path, strlen(path), limit_size, compress);
+
 }
 
 void Buffer::Clear() {
@@ -165,7 +165,7 @@ bool Buffer::OpenLogFile(const char *path) {
 }
 
 bool Buffer::IsCurrentLogFileOversize() {
-    return GetCurrentLogFileSize() >= buffer_header.GetHeader()->limit_size;
+    return GetCurrentLogFileSize() >= buffer_header.GetLimitSize();
 }
 
 size_t Buffer::GetCurrentLogFileSize() {

library_comm/src/main/cpp/buffer/buffer.h

@@ -1,9 +1,9 @@
 //
-// Created by #Suyghur, on 4/7/21.
+// Created by #Suyghur, on 2021/4/7.
 //
 
-#ifndef DOLIN_ZAP_BUFFER_H
-#define DOLIN_ZAP_BUFFER_H
+#ifndef DOLIN_COMMON_BUFFER_H
+#define DOLIN_COMMON_BUFFER_H
 
 #include <string>
 #include <mutex>
@@ -23,7 +23,7 @@ public:
 
     ~Buffer();
 
-    void InitData(char *log_path, size_t log_path_len, bool _compress, size_t _limit_size);
+    void InitData(char *log_path, size_t log_path_len, size_t limit_size, bool _compress);
 
     size_t GetLength();
 
@@ -43,7 +43,7 @@ public:
 
     void CallFileFlush(FileFlush *flush, Buffer *buffer);
 
-    void ChangeLogPath(char *path);
+    void ExpLogPath(char *path, size_t limit_size);
 
     bool IsCurrentLogFileOversize();
 
@@ -59,8 +59,9 @@ private:
 
     BufferHeader buffer_header;
     z_stream zStream{};
+//    size_t part_num = 1;
+//    size_t limit_size = 0;
     bool compress = false;
-    size_t limit_size = 0;
 
     void Clear();
 
@@ -75,4 +76,4 @@ private:
 };
 
 
-#endif //DOLIN_ZAP_BUFFER_H
+#endif //DOLIN_COMMON_BUFFER_H

library_comm/src/main/cpp/buffer/buffer_flush.cpp

@@ -1,5 +1,5 @@
 //
-// Created by #Suyghur, on 4/7/21.
+// Created by #Suyghur, on 2021/4/7.
 //
 
 #include <cmath>

library_comm/src/main/cpp/buffer/buffer_flush.h

@@ -1,9 +1,9 @@
 //
-// Created by #Suyghur, on 4/7/21.
+// Created by #Suyghur, on 2021/4/7.
 //
 
-#ifndef DOLIN_ZAP_BUFFER_FLUSH_H
-#define DOLIN_ZAP_BUFFER_FLUSH_H
+#ifndef DOLIN_COMMON_BUFFER_FLUSH_H
+#define DOLIN_COMMON_BUFFER_FLUSH_H
 
 
 #include <cstdio>
@@ -38,4 +38,4 @@ private:
 };
 
 
-#endif //DOLIN_ZAP_BUFFER_FLUSH_H
+#endif //DOLIN_COMMON_BUFFER_FLUSH_H

library_comm/src/main/cpp/buffer/buffer_header.cpp

@@ -1,5 +1,5 @@
 //
-// Created by #Suyghur, on 4/7/21.
+// Created by #Suyghur, on 2021/4/7.
 //
 
 #include "buffer_header.h"
@@ -14,16 +14,21 @@ void dolin_common::BufferHeader::InitHeader(dolin_common::Header &header) {
         return;
     }
     memcpy(data_ptr, &header.magic, sizeof(char));
+    //log长度
     memcpy(data_ptr + sizeof(char), &header.log_len, sizeof(size_t));
+    //log路径长度
     memcpy(data_ptr + sizeof(char) + sizeof(size_t), &header.log_path_len, sizeof(size_t));
+    //log路径
     memcpy(data_ptr + sizeof(char) + sizeof(size_t) + sizeof(size_t), header.log_path, header.log_path_len);
+    //限制大小
+    memcpy(data_ptr + sizeof(char) + sizeof(size_t) + sizeof(size_t) + header.log_path_len, &header.limit_size, sizeof(size_t));
+    //是否压缩
     char compress = 0;
     if (header.compress) {
         compress = 1;
     }
-    memcpy(data_ptr + sizeof(char) + sizeof(size_t) + sizeof(size_t) + header.log_path_len, &compress, sizeof(char));
-    memcpy(data_ptr + sizeof(char) + sizeof(size_t) + sizeof(size_t) + header.log_path_len + sizeof(char), &header.limit_size, sizeof(size_t));
-    LOGD("JNI-> InitHeader : %s", data_ptr);
+    memcpy(data_ptr + sizeof(char) + sizeof(size_t) + sizeof(size_t) + header.log_path_len + sizeof(size_t) + sizeof(size_t), &compress, sizeof(char));
+
 }
 
 /**
@@ -65,17 +70,19 @@ dolin_common::Header *dolin_common::BufferHeader::GetHeader() {
         memcpy(log_path, data_ptr + sizeof(char) + sizeof(size_t) + sizeof(size_t), log_path_len);
         header->log_path = log_path;
 
-        char compress = (data_ptr + sizeof(char) + sizeof(size_t) + sizeof(size_t) + log_path_len)[0];
-        header->compress = compress == 1;
-
         size_t limit_size = 0;
-        memcpy(&limit_size, data_ptr + sizeof(char) + sizeof(size_t) + sizeof(size_t) + log_path_len + sizeof(char), sizeof(size_t));
+        memcpy(&limit_size, data_ptr + sizeof(char) + sizeof(size_t) + sizeof(size_t) + log_path_len, sizeof(size_t));
         header->limit_size = limit_size;
+
+        char compress = (data_ptr + sizeof(char) + sizeof(size_t) + sizeof(size_t) + log_path_len + sizeof(size_t))[0];
+        header->compress = compress == 1;
+
+
         LOGD("JNI-> log_len : %d", log_len);
         LOGD("JNI-> log_path_len : %d", log_path_len);
         LOGD("JNI-> log_path : %s", log_path);
-        LOGD("JNI-> compress : %c", compress);
         LOGD("JNI-> limit_size : %d", limit_size);
+        LOGD("JNI-> compress : %c", compress);
     }
     return header;
 }
@@ -131,9 +138,18 @@ char *dolin_common::BufferHeader::GetLogPath() {
 }
 
 
+size_t dolin_common::BufferHeader::GetLimitSize() {
+    size_t size = 0;
+    if (IsAvailable()) {
+        memcpy(&size, data_ptr + sizeof(char) + sizeof(size_t) + sizeof(size_t) + GetLogPathLen(), sizeof(size_t));
+    }
+    return size;
+}
+
+
 bool dolin_common::BufferHeader::IsCompress() {
     if (IsAvailable()) {
-        return ((data_ptr + sizeof(char) + sizeof(size_t) + sizeof(size_t) + GetLogPathLen())[0]) == 1;
+        return ((data_ptr + sizeof(char) + sizeof(size_t) + sizeof(size_t) + GetLogPathLen() + sizeof(size_t))[0]) == 1;
     }
     return false;
 }
@@ -143,7 +159,7 @@ bool dolin_common::BufferHeader::IsAvailable() {
 }
 
 size_t dolin_common::BufferHeader::CalculateHeaderLen(size_t path_len) {
-    return sizeof(char) + sizeof(size_t) + sizeof(size_t) + path_len + sizeof(char) + sizeof(size_t);
+    return sizeof(char) + sizeof(size_t) + sizeof(size_t) + path_len + sizeof(size_t) + sizeof(char);
 }
 
 

library_comm/src/main/cpp/buffer/buffer_header.h

@@ -1,9 +1,9 @@
 //
-// Created by #Suyghur, on 4/7/21.
+// Created by #Suyghur, on 2021/4/7.
 //
 
-#ifndef DOLIN_ZAP_BUFFER_HEADER_H
-#define DOLIN_ZAP_BUFFER_HEADER_H
+#ifndef DOLIN_COMMON_BUFFER_HEADER_H
+#define DOLIN_COMMON_BUFFER_HEADER_H
 
 #include <string>
 
@@ -45,6 +45,8 @@ namespace dolin_common {
 
         char *GetLogPath();
 
+        size_t GetLimitSize();
+
         bool IsCompress();
 
         bool IsAvailable();
@@ -58,4 +60,4 @@ namespace dolin_common {
 }
 
 
-#endif //DOLIN_ZAP_BUFFER_HEADER_H
+#endif //DOLIN_COMMON_BUFFER_HEADER_H

library_comm/src/main/cpp/buffer/file_flush.cpp

@@ -1,5 +1,5 @@
 //
-// Created by #Suyghur, on 4/7/21.
+// Created by #Suyghur, on 2021/4/7.
 //
 
 #include "file_flush.h"

library_comm/src/main/cpp/buffer/file_flush.h

@@ -1,9 +1,9 @@
 //
-// Created by #Suyghur, on 4/7/21.
+// Created by #Suyghur, on 2021/4/7.
 //
 
-#ifndef DOLIN_ZAP_FILE_FLUSH_H
-#define DOLIN_ZAP_FILE_FLUSH_H
+#ifndef DOLIN_COMMON_FILE_FLUSH_H
+#define DOLIN_COMMON_FILE_FLUSH_H
 
 
 #include "buffer_flush.h"
@@ -33,4 +33,4 @@ private:
 };
 
 
-#endif //DOLIN_ZAP_FILE_FLUSH_H
+#endif //DOLIN_COMMON_FILE_FLUSH_H

library_comm/src/main/cpp/kit/time_kit.cpp

@@ -1,5 +1,5 @@
 //
-// Created by #Suyghur, on 4/20/21.
+// Created by #Suyghur, on 2021/4/20.
 //
 
 #include "time_kit.h"

library_comm/src/main/cpp/kit/time_kit.h

@@ -1,5 +1,5 @@
 //
-// Created by #Suyghur, on 4/20/21.
+// Created by #Suyghur, on 2021/4/20.
 //
 
 #ifndef DOLIN_TIME_KIT_H

library_comm/src/main/java/com/dolin/common/util/FileUtils.kt

@@ -18,6 +18,6 @@ object FileUtils {
             path.mkdirs()
         }
         return path.absolutePath
-
     }
+
 }

library_zap/src/main/cpp/third_part/buffer/buffer.h

@@ -1,9 +1,9 @@
 //
-// Created by #Suyghur, on 4/7/21.
+// Created by #Suyghur, on 2021/4/7.
 //
 
-#ifndef DOLIN_ZAP_BUFFER_H
-#define DOLIN_ZAP_BUFFER_H
+#ifndef DOLIN_COMMON_BUFFER_H
+#define DOLIN_COMMON_BUFFER_H
 
 #include <string>
 #include <mutex>
@@ -23,7 +23,7 @@ public:
 
     ~Buffer();
 
-    void InitData(char *log_path, size_t log_path_len, bool _compress, size_t _limit_size);
+    void InitData(char *log_path, size_t log_path_len, size_t limit_size, bool _compress);
 
     size_t GetLength();
 
@@ -43,7 +43,7 @@ public:
 
     void CallFileFlush(FileFlush *flush, Buffer *buffer);
 
-    void ChangeLogPath(char *path);
+    void ExpLogPath(char *path, size_t limit_size);
 
     bool IsCurrentLogFileOversize();
 
@@ -59,8 +59,8 @@ private:
 
     BufferHeader buffer_header;
     z_stream zStream{};
+
     bool compress = false;
-    size_t limit_size = 0;
 
     void Clear();
 
@@ -75,4 +75,4 @@ private:
 };
 
 
-#endif //DOLIN_ZAP_BUFFER_H
+#endif //DOLIN_COMMON_BUFFER_H

library_zap/src/main/cpp/third_part/buffer/buffer_flush.h

@@ -1,9 +1,9 @@
 //
-// Created by #Suyghur, on 4/7/21.
+// Created by #Suyghur, on 2021/4/7.
 //
 
-#ifndef DOLIN_ZAP_BUFFER_FLUSH_H
-#define DOLIN_ZAP_BUFFER_FLUSH_H
+#ifndef DOLIN_COMMON_BUFFER_FLUSH_H
+#define DOLIN_COMMON_BUFFER_FLUSH_H
 
 
 #include <cstdio>
@@ -38,4 +38,4 @@ private:
 };
 
 
-#endif //DOLIN_ZAP_BUFFER_FLUSH_H
+#endif //DOLIN_COMMON_BUFFER_FLUSH_H

library_zap/src/main/cpp/third_part/buffer/buffer_header.h

@@ -1,9 +1,9 @@
 //
-// Created by #Suyghur, on 4/7/21.
+// Created by #Suyghur, on 2021/4/7.
 //
 
-#ifndef DOLIN_ZAP_BUFFER_HEADER_H
-#define DOLIN_ZAP_BUFFER_HEADER_H
+#ifndef DOLIN_COMMON_BUFFER_HEADER_H
+#define DOLIN_COMMON_BUFFER_HEADER_H
 
 #include <string>
 
@@ -45,6 +45,8 @@ namespace dolin_common {
 
         char *GetLogPath();
 
+        size_t GetLimitSize();
+
         bool IsCompress();
 
         bool IsAvailable();
@@ -58,4 +60,4 @@ namespace dolin_common {
 }
 
 
-#endif //DOLIN_ZAP_BUFFER_HEADER_H
+#endif //DOLIN_COMMON_BUFFER_HEADER_H

library_zap/src/main/cpp/third_part/buffer/file_flush.h

@@ -1,9 +1,9 @@
 //
-// Created by #Suyghur, on 4/7/21.
+// Created by #Suyghur, on 2021/4/7.
 //
 
-#ifndef DOLIN_ZAP_FILE_FLUSH_H
-#define DOLIN_ZAP_FILE_FLUSH_H
+#ifndef DOLIN_COMMON_FILE_FLUSH_H
+#define DOLIN_COMMON_FILE_FLUSH_H
 
 
 #include "buffer_flush.h"
@@ -33,4 +33,4 @@ private:
 };
 
 
-#endif //DOLIN_ZAP_FILE_FLUSH_H
+#endif //DOLIN_COMMON_FILE_FLUSH_H

library_zap/src/main/cpp/zap.cpp

@@ -1,5 +1,5 @@
 //
-// Created by #Suyghur, on 4/7/21.
+// Created by #Suyghur, on 2021/4/7.
 //
 #include <jni.h>
 #include <sys/stat.h>
@@ -50,8 +50,15 @@ static char *OpenMMap(int buffer_fd, size_t buffer_size) {
 }
 
 
-static jlong InitNative(JNIEnv *env, jclass thiz, jstring buffer_path, jint capacity,
-                        jstring log_path, jboolean compress, jint limit_size) {
+static jlong InitNative(JNIEnv *env, jclass thiz, jstring buffer_path, jstring log_path, jint capacity, jint limit_size, jboolean compress) {
+//    const char *_folder_path = env->GetStringUTFChars(folder_path, JNI_FALSE);
+//    const char *_log_date = env->GetStringUTFChars(log_date, JNI_FALSE);
+//    size_t folder_path_len = strlen(_folder_path);
+//    size_t log_date_len = strlen(_log_date);
+
+//    char *buffer_path = (char *) malloc(folder_path_len + 10);
+//    sprintf(buffer_path, "%s%s", _folder_path, "/zap.cache");
+
     const char *_buffer_path = env->GetStringUTFChars(buffer_path, JNI_FALSE);
     const char *_log_path = env->GetStringUTFChars(log_path, JNI_FALSE);
     auto buffer_size = static_cast<size_t>(capacity);
@@ -74,7 +81,7 @@ static jlong InitNative(JNIEnv *env, jclass thiz, jstring buffer_path, jint capa
     auto *buffer = new Buffer(buffer_ptr, buffer_size);
     buffer->CallFileFlush(pFileFlush);
     //将 buffer 中的数据清空，并写入日志文件信息
-    buffer->InitData((char *) _log_path, strlen(_log_path), compress, limit_size);
+    buffer->InitData((char *) _log_path, strlen(_log_path),  limit_size, compress);
     buffer->map_buffer = map_buffer;
 
     env->ReleaseStringUTFChars(buffer_path, _buffer_path);
@@ -103,10 +110,10 @@ static void AsyncFlushNative(JNIEnv *env, jobject thiz, jlong ptr) {
     }
 }
 
-static void ExpLogFile(JNIEnv *env, jobject thiz, jlong ptr, jstring path, jint part_num) {
+static void ExpLogFileNative(JNIEnv *env, jobject thiz, jlong ptr, jstring path,  jint limit_size) {
     const char *log_path = env->GetStringUTFChars(path, JNI_FALSE);
     auto *buffer = reinterpret_cast<Buffer *>(ptr);
-    buffer->ChangeLogPath(const_cast<charf *>(log_path));
+    buffer->ExpLogPath(const_cast<charf *>(log_path), limit_size);
     env->ReleaseStringUTFChars(path, log_path);
 }
 
@@ -122,28 +129,16 @@ static void ReleaseNative(JNIEnv *env, jobject thiz, jlong ptr) {
 
 static jboolean IsLogFileOverSizeNative(JNIEnv *env, jobject thiz, jlong ptr) {
     auto *buffer = reinterpret_cast<Buffer *>(ptr);
-    if (buffer->IsCurrentLogFileOversize()) {
-        LOGD("JNI -> oversize");
-        return JNI_TRUE;
-    } else {
-        LOGD("JNI -> not oversize");
-        return JNI_FALSE;
-    }
-}
-
-static jint GetPartNumNative(JNIEnv *env, jobject thiz, jlong ptr) {
-    return 0;
+    return buffer->IsCurrentLogFileOversize() ? JNI_TRUE : JNI_FALSE;
 }
 
 static JNINativeMethod gMethods[] = {
-        {"initNative",              "(Ljava/lang/String;ILjava/lang/String;ZI)J", (void *) InitNative},
+        {"initNative",              "(Ljava/lang/String;Ljava/lang/String;IIZ)J", (void *) InitNative},
         {"writeNative",             "(JLjava/lang/String;)V",                     (void *) WriteNative},
         {"asyncFlushNative",        "(J)V",                                       (void *) AsyncFlushNative},
-        {"expLogFileNative",        "(JLjava/lang/String;I)V",                    (void *) ExpLogFile},
+        {"expLogFileNative",        "(JLjava/lang/String;I)V",                   (void *) ExpLogFileNative},
         {"releaseNative",           "(J)V",                                       (void *) ReleaseNative},
-        {"isLogFileOverSizeNative", "(J)Z",                                       (void *) IsLogFileOverSizeNative},
-        {"getPartNumNative",        "(J)I",                                       (void *) GetPartNumNative}
-};
+        {"isLogFileOverSizeNative", "(J)Z",                                       (void *) IsLogFileOverSizeNative}};
 
 extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
     JNIEnv *env = nullptr;

library_zap/src/main/java/com/dolin/zap/impl/Record2MMap.kt

@@ -1,21 +1,32 @@
 package com.dolin.zap.impl
 
-import android.util.Log
 import com.dolin.zap.internal.IRecord
+import com.dolin.zap.util.LogFileUtils
 
 /**
  * @author #Suyghur.
  * Created on 4/7/21
  */
-class Record2MMap(bufferPath: String, capacity: Int, private val logPath: String, compress: Boolean, limitSize: Int) : IRecord {
+class Record2MMap(private val folderPath: String, private val logDate: String,
+                  capacity: Int, private val limitSize: Int, compress: Boolean) : IRecord {
 
     //buffer指针
     private var ptr = 0L
+    private var bufferPath: String
+    private var logPath: String
+    private var num = 1
 
     init {
         System.loadLibrary("dolin-zap")
+        num = LogFileUtils.getLogFileNumByDate(folderPath, logDate)
+        bufferPath = "$folderPath/zap.cache"
+        logPath = if (num > 1) {
+            "$folderPath/$logDate/$logDate-p$num.zap"
+        } else {
+            "$folderPath/$logDate/$logDate.zap"
+        }
         try {
-            ptr = initNative(bufferPath, capacity, logPath, compress, limitSize)
+            ptr = initNative(bufferPath, logPath, capacity, limitSize, compress)
         } catch (e: Exception) {
             e.printStackTrace()
         }
@@ -34,10 +45,10 @@ class Record2MMap(bufferPath: String, capacity: Int, private val logPath: String
     override fun asyncFlush() {
         if (ptr != 0L) {
             try {
-                Log.d("dolin_zap", "log path $logPath")
+                //自动扩容
                 if (isLogFileOverSizeNative(ptr)) {
-                    //新建文件扩展文件
-//                    changeLogPathNative()
+                    logPath = "$folderPath/$logDate/$logDate-p${num + 1}.zap"
+                    expLogFileNative(ptr, logPath, limitSize)
                 }
                 asyncFlushNative(ptr)
             } catch (e: Exception) {
@@ -46,10 +57,10 @@ class Record2MMap(bufferPath: String, capacity: Int, private val logPath: String
         }
     }
 
-    override fun expLogFile(path: String, partNum: Int) {
+    override fun expLogFile(path: String, limitSize: Int) {
         if (ptr != 0L) {
             try {
-                expLogFileNative(ptr, path, partNum)
+                expLogFileNative(ptr, path, limitSize)
             } catch (e: Exception) {
                 e.printStackTrace()
             }
@@ -70,16 +81,14 @@ class Record2MMap(bufferPath: String, capacity: Int, private val logPath: String
 
     private external fun asyncFlushNative(ptr: Long)
 
-    private external fun expLogFileNative(ptr: Long, path: String, partNum: Int)
+    private external fun expLogFileNative(ptr: Long, path: String, limitSize: Int)
 
     private external fun releaseNative(ptr: Long)
 
-    private external fun getPartNumNative(ptr: Long): Int
-
     private external fun isLogFileOverSizeNative(ptr: Long): Boolean
 
     companion object {
         @JvmStatic
-        private external fun initNative(bufferPath: String, capacity: Int, logPath: String, compress: Boolean, limitSize: Int): Long
+        private external fun initNative(bufferPath: String, logPath: String, capacity: Int, limitSize: Int, compress: Boolean): Long
     }
 }

library_zap/src/main/java/com/dolin/zap/impl/ZapPrint.kt

@@ -50,9 +50,9 @@ class ZapPrint : IPrint {
         this.logcatLevel = config.logcatLevel
         this.recordLevel = config.recordLevel
 
-        val logFileName = logDir + File.separator + SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(Date()) + ".zap"
+        val date = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(Date())
         if (config.recordEnable) {
-            record2MMap = Record2MMap("$logDir/zap.cache", 1024 * 400, logFileName, config.compressEnable, config.fileSizeLimitDayByte)
+            record2MMap = Record2MMap(logDir, date, 1024 * 400, config.fileSizeLimitDayByte, config.compressEnable)
             ZapLifecycle.registerZapLifeCallback(application, record2MMap!!)
         }
 

library_zap/src/main/java/com/dolin/zap/internal/IRecord.kt

@@ -10,7 +10,7 @@ interface IRecord {
 
     fun asyncFlush()
 
-    fun expLogFile(path: String, partNum: Int)
+    fun expLogFile(path: String, limitSize: Int)
 
     fun release()
 }

library_zap/src/main/java/com/dolin/zap/util/LogFileUtils.kt

@@ -1,6 +1,5 @@
 package com.dolin.zap.util
 
-import android.content.Context
 import java.io.File
 
 /**
@@ -9,8 +8,8 @@ import java.io.File
  */
 object LogFileUtils {
 
-    fun cleanOverdueLog( logFolderPath: String, overdueDayMs: Long) {
-        val folder = File(logFolderPath)
+    fun cleanOverdueLog(folderPath: String, overdueDayMs: Long) {
+        val folder = File(folderPath)
         if (!folder.exists()) {
             return
         }
@@ -27,4 +26,19 @@ object LogFileUtils {
     private fun isFileOverdue(file: File, overdueDayMs: Long): Boolean {
         return System.currentTimeMillis() - file.lastModified() > overdueDayMs
     }
+
+    fun getLogFileNumByDate(folderPath: String, date: String): Int {
+        var num = 0
+        val folder = File(folderPath)
+        if (!folder.exists()) {
+            return num
+        }
+        repeat(folder.walk().maxDepth(1)
+                .filter { it.isFile }
+                .filter { it.name.startsWith(date) }
+                .count()) {
+            num++
+        }
+        return num
+    }
 }