[init] persistent feature

sample/CMakeLists.txt

@@ -10,7 +10,7 @@ set(PRODUCER_SAMPLE_SOURCE_FILES log_producer_sample.c)
 
 set(PRODUCER_BENCHMARK_SOURCE_FILES log_producer_benchmark.c)
 
-set(PRODUCER_FRAME_SOURCE_FILES video_frame_producer_sample.c)
+set(PRODUCER_PERSISTENT_SAMPLE_SOURCE_FILES log_producer_persistent_sample.c)
 
 include_directories (${CURL_INCLUDE_DIR})
 include_directories ("${CMAKE_SOURCE_DIR}/src")
@@ -19,8 +19,8 @@ find_library(CURL_LIBRARY curl)
 find_library(PTHREAD_LIBRARY pthread)
 find_library(RT_LIBRARY rt)
 find_library(M_LIBRARY m)
-find_library(SSL_LIBRARY ssl)
-find_library(CRYPTO_LIBRARY crypto)
+#find_library(SSL_LIBRARY ssl)
+#find_library(CRYPTO_LIBRARY crypto)
 find_library(ZLIB_LIBRARY z)
 find_library(DL_LIBRARY dl)
 
@@ -31,8 +31,8 @@ function(_TARGET_SAMPLE_LIBRARIES SAMPLE_BIN_NAME SOURCE_FILES)
 	 target_link_libraries(${SAMPLE_BIN_NAME} ${PTHREAD_LIBRARY})
 	 target_link_libraries(${SAMPLE_BIN_NAME} ${M_LIBRARY})
 	 target_link_libraries(${SAMPLE_BIN_NAME} ${DL_LIBRARY})
-     target_link_libraries(${SAMPLE_BIN_NAME} ${SSL_LIBRARY})
-     target_link_libraries(${SAMPLE_BIN_NAME} ${CRYPTO_LIBRARY})
+	 #target_link_libraries(${SAMPLE_BIN_NAME} ${SSL_LIBRARY})
+     #target_link_libraries(${SAMPLE_BIN_NAME} ${CRYPTO_LIBRARY})
      target_link_libraries(${SAMPLE_BIN_NAME} ${ZLIB_LIBRARY})
 endfunction()
 
@@ -42,4 +42,5 @@ _TARGET_SAMPLE_LIBRARIES(log_post_logs_sample "${POST_LOGS_SOURCE_FILES}")
 
 _TARGET_SAMPLE_LIBRARIES(log_producer_benchmark "${PRODUCER_BENCHMARK_SOURCE_FILES}")
 
-_TARGET_SAMPLE_LIBRARIES(video_frame_producer_sample "${PRODUCER_FRAME_SOURCE_FILES}")
+_TARGET_SAMPLE_LIBRARIES(log_producer_persistent_sample "${PRODUCER_PERSISTENT_SAMPLE_SOURCE_FILES}")
+

sample/log_post_logs_sample.c

@@ -85,10 +85,15 @@ void post_logs_with_http_cont_lz4_log_option()
             printf("serialize_to_proto_buf_with_malloc_lz4 failed\n");
             exit(1);
         }
+        log_post_option option;
+        memset(&option, 0, sizeof(log_post_option));
+        option.connect_timeout = 10;
+        option.operation_timeout = 15;
+        option.compress_type = 0;
         post_log_result * rst = post_logs_from_lz4buf(LOG_ENDPOINT, ACCESS_KEY_ID,
                                                  ACCESS_KEY_SECRET, NULL,
                                                  PROJECT_NAME, LOGSTORE_NAME,
-                                                 pLZ4Buf);
+                                                 pLZ4Buf, &option);
         printf("result %d %d \n", i, rst->statusCode);
         if (rst->errorMessage != NULL)
         {

sample/log_producer_benchmark.c

@@ -91,7 +91,7 @@ void builder_speed_test(int32_t logsPerGroup)
     aos_error_log("total time sec  %d ", (time(NULL) - startTime));
 }
 
-void on_log_send_done(const char * config_name, log_producer_result result, size_t log_bytes, size_t compressed_bytes, const char * req_id, const char * message)
+void on_log_send_done(const char * config_name, log_producer_result result, size_t log_bytes, size_t compressed_bytes, const char * req_id, const char * message, const unsigned char * raw_buffer, void *user_param)
 {
     if (result == LOG_PRODUCER_OK)
     {
@@ -161,7 +161,7 @@ log_producer * create_log_producer_wrapper(on_log_producer_send_done_function on
     // set send thread
     log_producer_config_set_send_thread_count(config, 16);
 
-    return create_log_producer(config, on_send_done);
+    return create_log_producer(config, on_send_done, NULL);
 }
 
 #define MUTLI_THREAD_COUNT 16

sample/log_producer_persistent_sample.c

@@ -0,0 +1,147 @@
+//
+// Created by ZhangCheng on 26/12/2017.
+//
+
+#include "log_api.h"
+#include "log_producer_config.h"
+#include "log_producer_client.h"
+#include "inner_log.h"
+
+void on_log_send_done(const char * config_name,
+                      log_producer_result result,
+                      size_t log_bytes,
+                      size_t compressed_bytes,
+                      const char * req_id,
+                      const char * message,
+                      const unsigned char * raw_buffer,
+                      void * userparams)
+{
+    if (result == LOG_PRODUCER_OK)
+    {
+        printf("send success, config : %s, result : %d, log bytes : %d, compressed bytes : %d, request id : %s \n",
+               config_name, (result),
+               (int)log_bytes, (int)compressed_bytes, req_id);
+
+    }
+    else
+    {
+        printf("send fail, config : %s, result : %d, log bytes : %d, compressed bytes : %d, request id : %s, error message : %s\n",
+               config_name, (result),
+               (int)log_bytes, (int)compressed_bytes, req_id, message);
+    }
+
+}
+
+log_producer * create_log_producer_wrapper(on_log_producer_send_done_function on_send_done)
+{
+    log_producer_config * config = create_log_producer_config();
+    // endpoint list:  https://help.aliyun.com/document_detail/29008.html
+    log_producer_config_set_endpoint(config, "${your_endpoint}");
+    log_producer_config_set_project(config, "${your_project}");
+    log_producer_config_set_logstore(config, "${your_logstore}");
+    log_producer_config_set_access_id(config, "${your_access_key_id}");
+    log_producer_config_set_access_key(config, "${your_access_key_secret}");
+
+
+    // if you do not need topic or tag, comment it
+    log_producer_config_set_topic(config, "test_topic");
+    log_producer_config_add_tag(config, "tag_1", "val_1");
+    log_producer_config_add_tag(config, "tag_2", "val_2");
+    log_producer_config_add_tag(config, "tag_3", "val_3");
+    log_producer_config_add_tag(config, "tag_4", "val_4");
+    log_producer_config_add_tag(config, "tag_5", "val_5");
+
+    // set resource params
+    log_producer_config_set_packet_log_bytes(config, 512*1024);
+    log_producer_config_set_packet_log_count(config, 4096);
+    log_producer_config_set_packet_timeout(config, 3000);
+    log_producer_config_set_max_buffer_limit(config, 4*1024*1024);
+
+    // @note only 1 thread count, persistent client only support 1 thread
+    log_producer_config_set_send_thread_count(config, 1);
+
+    // set persistent
+    log_producer_config_set_persistent(config, 1);
+    log_producer_config_set_persistent_file_path(config, "/Users/zhangcheng/Downloads/data/log.dat");
+    log_producer_config_set_persistent_force_flush(config, 1);
+    log_producer_config_set_persistent_max_file_count(config, 10);
+    log_producer_config_set_persistent_max_file_size(config, 1024*1024);
+    log_producer_config_set_persistent_max_log_count(config, 65536);
+
+
+    return create_log_producer(config, on_send_done, NULL);
+}
+
+
+void log_producer_post_logs()
+{
+    if (log_producer_env_init() != LOG_PRODUCER_OK) {
+        exit(1);
+    }
+
+    log_producer * producer = create_log_producer_wrapper(on_log_send_done);
+    if (producer == NULL)
+    {
+        printf("create log producer by config fail \n");
+        exit(1);
+    }
+
+    log_producer_client * client = get_log_producer_client(producer, NULL);
+    if (client == NULL)
+    {
+        printf("create log producer client by config fail \n");
+        exit(1);
+    }
+
+    //sleep(30000000);
+    int i = 0;
+    for (; i < 100000; ++i)
+    {
+        char indexStr[32];
+        sprintf(indexStr, "%d", i);
+        while (1)
+        {
+            log_producer_result rst = log_producer_client_add_log(client, 20, "content_key_1", "1abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+",
+                                        "content_key_2", "2abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+",
+                                        "content_key_3", "3abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+",
+                                        "content_key_4", "4abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+",
+                                        "content_key_5", "5abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+",
+                                        "content_key_6", "6abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+",
+                                        "content_key_7", "7abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+",
+                                        "content_key_8", "davidzhangggggggg",
+                                        "content_key_9", "中文测试",
+                                        "index", indexStr);
+
+            if (rst != LOG_PRODUCER_OK)
+            {
+                printf("add log error %d \n", rst);
+                usleep(100000);
+                continue;
+            }
+            else
+            {
+                break;
+            }
+        }
+
+
+        usleep(1);
+    }
+    sleep(1000);
+    //_exit(0);
+
+
+
+
+    destroy_log_producer(producer);
+
+    log_producer_env_destroy();
+}
+
+int main(int argc, char *argv[])
+{
+    aos_log_set_level(AOS_LOG_INFO);
+    log_producer_post_logs();
+    return 0;
+}
+

sample/log_producer_sample.c

@@ -6,7 +6,14 @@
 #include "log_producer_config.h"
 #include "log_producer_client.h"
 
-void on_log_send_done(const char * config_name, log_producer_result result, size_t log_bytes, size_t compressed_bytes, const char * req_id, const char * message)
+void on_log_send_done(const char * config_name,
+                      log_producer_result result,
+                      size_t log_bytes,
+                      size_t compressed_bytes,
+                      const char * req_id,
+                      const char * message,
+                      const unsigned char * raw_buffer,
+                      void * userparams)
 {
     if (result == LOG_PRODUCER_OK)
     {
@@ -51,7 +58,7 @@ log_producer * create_log_producer_wrapper(on_log_producer_send_done_function on
     // set send thread count
     log_producer_config_set_send_thread_count(config, 4);
 
-    return create_log_producer(config, on_send_done);
+    return create_log_producer(config, on_send_done, NULL);
 }