diff --git a/HISTORY b/HISTORY
index 0df7ff1..b0a836a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,10 +1,11 @@
 
-Version 5.07  2015-08-15
+Version 5.07  2015-08-16
  * schedule task add the "second" field
  * make.sh changed, you must upgrade libfastcommon to V1.20 or later
  * bug fixed: storage_disk_recovery.c skip the first file (binlog first line)
  * bug fixed: should close connection after fetch binlog
  * fdfs_storaged.c: advance the position of daemon_init
+ * set log rotate time format
 
 Version 5.06  2015-05-12
  * compile passed in mac OS Darwin
diff --git a/storage/storage_func.c b/storage/storage_func.c
index e8ddc0e..dc893ba 100644
--- a/storage/storage_func.c
+++ b/storage/storage_func.c
@@ -1684,7 +1684,7 @@ int storage_func_init(const char *filename, \
 			break;
 		}
 		if (rotate_access_log_size > 0 && \
-			rotate_access_log_size< FDFS_ONE_MB)
+			rotate_access_log_size < FDFS_ONE_MB)
 		{
 			logWarning("file: "__FILE__", line: %d, " \
 				"item \"rotate_access_log_size\": " \
@@ -1693,7 +1693,7 @@ int storage_func_init(const char *filename, \
 				rotate_access_log_size);
 			rotate_access_log_size = FDFS_ONE_MB;
 		}
-		g_access_log_context.rotate_size = rotate_access_log_size;
+		fdfs_set_log_rotate_size(&g_access_log_context, rotate_access_log_size);
 
 		pRotateErrorLogSize = iniGetStrValue(NULL, \
 			"rotate_error_log_size", &iniContext);
@@ -1716,7 +1716,7 @@ int storage_func_init(const char *filename, \
 				rotate_error_log_size);
 			rotate_error_log_size = FDFS_ONE_MB;
 		}
-		g_log_context.rotate_size = rotate_error_log_size;
+		fdfs_set_log_rotate_size(&g_log_context, rotate_error_log_size);
 
 		g_log_file_keep_days = iniGetIntValue(NULL, \
 				"log_file_keep_days", &iniContext, 0);
diff --git a/tracker/fdfs_shared_func.c b/tracker/fdfs_shared_func.c
index c0f0c58..c3260f1 100644
--- a/tracker/fdfs_shared_func.c
+++ b/tracker/fdfs_shared_func.c
@@ -1016,3 +1016,17 @@ void fdfs_connection_pool_destroy()
 	conn_pool_destroy(&g_connection_pool);
 }
 
+void fdfs_set_log_rotate_size(LogContext *pContext, const int64_t log_rotate_size)
+{
+	if (log_rotate_size > 0)
+	{
+		pContext->rotate_size = log_rotate_size;
+		log_set_rotate_time_format(pContext, "%Y%m%d_%H%M%S");
+	}
+	else
+	{
+		pContext->rotate_size = 0;
+		log_set_rotate_time_format(pContext, "%Y%m%d");
+	}
+}
+
diff --git a/tracker/fdfs_shared_func.h b/tracker/fdfs_shared_func.h
index d40c5f0..899bf5d 100644
--- a/tracker/fdfs_shared_func.h
+++ b/tracker/fdfs_shared_func.h
@@ -13,6 +13,7 @@
 
 #include "common_define.h"
 #include "ini_file_reader.h"
+#include "logger.h"
 #include "tracker_types.h"
 
 #ifdef __cplusplus
@@ -77,6 +78,8 @@ int fdfs_connection_pool_init(const char *config_filename, \
 
 void fdfs_connection_pool_destroy();
 
+void fdfs_set_log_rotate_size(LogContext *pContext, const int64_t log_rotate_size);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/tracker/tracker_func.c b/tracker/tracker_func.c
index 3dd814a..cefbf78 100644
--- a/tracker/tracker_func.c
+++ b/tracker/tracker_func.c
@@ -603,7 +603,7 @@ int tracker_load_from_conf_file(const char *filename, \
 				rotate_error_log_size);
 			rotate_error_log_size = FDFS_ONE_MB;
 		}
-		g_log_context.rotate_size = rotate_error_log_size;
+		fdfs_set_log_rotate_size(&g_log_context, rotate_error_log_size);
 
 		g_log_file_keep_days = iniGetIntValue(NULL, \
 				"log_file_keep_days", &iniContext, 0);
@@ -729,7 +729,7 @@ int tracker_load_from_conf_file(const char *filename, \
 			g_rotate_error_log, g_error_log_rotate_time.hour, \
 			g_error_log_rotate_time.minute, \
 			g_log_context.rotate_size, g_log_file_keep_days,
-            g_store_slave_file_use_link, \
+			g_store_slave_file_use_link, \
 			g_use_connection_pool, g_connection_pool_max_idle_time);
 
 #ifdef WITH_HTTPD