[modify] add LOG_PRODUCER_SEND_TIME_ERROR

[modify] force rebuild when SEND_TIME_ERROR
xfc1939 · Jan 16, 2018 · 36673c2 · 36673c2
1 parent 0672831
commit 36673c2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/log_producer_common.c b/src/log_producer_common.c
@@ -17,6 +17,7 @@ log_producer_result LOG_PRODUCER_SEND_QUOTA_ERROR = 5;
 log_producer_result LOG_PRODUCER_SEND_UNAUTHORIZED = 6;
 log_producer_result LOG_PRODUCER_SEND_SERVER_ERROR = 7;
 log_producer_result LOG_PRODUCER_SEND_DISCARD_ERROR = 8;
+log_producer_result LOG_PRODUCER_SEND_TIME_ERROR = 9;
 
 const char * log_producer_result_string[] = {
         "LOG_PRODUCER_OK",
@@ -27,7 +28,8 @@ const char * log_producer_result_string[] = {
         "LOG_PRODUCER_SEND_QUOTA_ERROR",
         "LOG_PRODUCER_SEND_UNAUTHORIZED",
         "LOG_PRODUCER_SEND_SERVER_ERROR",
-        "LOG_PRODUCER_SEND_DISCARD_ERROR"
+        "LOG_PRODUCER_SEND_DISCARD_ERROR",
+        "LOG_PRODUCER_SEND_TIME_ERROR"
 };
 
 const char * log_producer_level_string[] = {
@@ -47,6 +49,10 @@ int is_log_producer_result_ok(log_producer_result rst)
 
 const char * get_log_producer_result_string(log_producer_result rst)
 {
+    if ((int)rst < 0 || (int)rst >= sizeof(log_producer_result_string) / sizeof(char *))
+    {
+        return log_producer_result_string[1];
+    }
     return log_producer_result_string[rst];
 }
 

diff --git a/src/log_producer_common.h b/src/log_producer_common.h
@@ -49,6 +49,7 @@ extern log_producer_result LOG_PRODUCER_SEND_QUOTA_ERROR;
 extern log_producer_result LOG_PRODUCER_SEND_UNAUTHORIZED;
 extern log_producer_result LOG_PRODUCER_SEND_SERVER_ERROR;
 extern log_producer_result LOG_PRODUCER_SEND_DISCARD_ERROR;
+extern log_producer_result LOG_PRODUCER_SEND_TIME_ERROR;
 
 
 

diff --git a/src/log_producer_sender.c b/src/log_producer_sender.c
@@ -96,7 +96,7 @@ void * log_producer_send_fun(apr_thread_t * thread, void * param)
         lz4_log_buf * send_buf = send_param->log_buf;
 #ifdef SEND_TIME_INVALID_FIX
         uint32_t nowTime = time(NULL);
-        if (nowTime - send_param->builder_time > 600 || send_param->builder_time > nowTime)
+        if (nowTime - send_param->builder_time > 600 || send_param->builder_time > nowTime || error_info.last_send_error == LOG_SEND_TIME_ERROR)
         {
             _rebuild_time(send_param->log_buf, &send_buf);
             send_param->builder_time = nowTime;