From 66dda7ccffda14574212ec6ba36a9275c48946e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A8=81?= Date: Tue, 27 Oct 2020 17:15:09 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8feat(tsg=5Fsend=5Flog.cpp):=20=20?= =?UTF-8?q?=E6=8C=89rfc7159=E5=AE=9A=E4=B9=89=E7=9A=84json=E8=BE=93?= =?UTF-8?q?=E5=87=BAnumber=E6=A0=BC=E5=BC=8F=E9=81=B5=E5=BE=AAIEEE=20754?= =?UTF-8?q?=E6=A0=87=E5=87=86,=E5=8F=AF=E8=83=BD=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E7=B2=BE=E5=BA=A6,=E5=9B=A0=E6=AD=A4=E5=B0=86stream=5Fstrace?= =?UTF-8?q?=5Fid=E8=BE=93=E5=87=BA=E6=A0=BC=E5=BC=8F=E6=94=B9=E6=88=90stri?= =?UTF-8?q?ng?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ cmake/Version.cmake | 2 +- src/tsg_send_log.cpp | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a3062be..56794de 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ .vscode/* +build/ +cmake-build-* diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 9b05d0b..a47944c 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -3,7 +3,7 @@ set(__SOURCE_AUTORESIVISION ${CMAKE_SOURCE_DIR}/autorevision.sh) set(__AUTORESIVISION ${CMAKE_BINARY_DIR}/autorevision.sh) -set(__VERSION_CACHE ${CMAKE_SOURCE_DIR}/version.txt) +set(__VERSION_CACHE ${CMAKE_BINARY_DIR}/version.txt) set(__VERSION_CONFIG ${CMAKE_BINARY_DIR}/version.cmake) file(COPY ${__SOURCE_AUTORESIVISION} DESTINATION ${CMAKE_BINARY_DIR} diff --git a/src/tsg_send_log.cpp b/src/tsg_send_log.cpp index 0c43608..6adc3b5 100644 --- a/src/tsg_send_log.cpp +++ b/src/tsg_send_log.cpp @@ -187,7 +187,7 @@ static int set_common_sub_action(struct TLD_handle_t *handle, char *field_name, int set_common_field_from_label(struct tsg_log_instance_t *_instance, struct TLD_handle_t *_handle, struct streaminfo *a_stream) { - char buff[512]={0}; + char buff[1024]={0}; struct _location_info_t *location=NULL; struct _session_attribute_label_t *internal_label=NULL; @@ -341,7 +341,9 @@ int TLD_append_streaminfo(struct tsg_log_instance_t *instance, struct TLD_handle } stream_id=tsg_get_stream_id(a_stream); - TLD_append(_handle, _instance->id2field[LOG_COMMON_STREAM_TRACE_ID].name, (void *)(long)stream_id, TLD_TYPE_LONG); + char stream_id_buff[128]=""; + snprintf(stream_id_buff, sizeof(stream_id_buff), "%llu", stream_id); + TLD_append(_handle, _instance->id2field[LOG_COMMON_STREAM_TRACE_ID].name, (void *)stream_id_buff, TLD_TYPE_STRING); addr_proto=(char *)layer_addr_prefix_ntop(a_stream); TLD_append(_handle, _instance->id2field[LOG_COMMON_L4_PROTOCOL].name, (void *)addr_proto, TLD_TYPE_STRING);