summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/tsg_action.cpp2
-rw-r--r--src/tsg_bridge.cpp2
-rw-r--r--src/tsg_entry.cpp5
-rw-r--r--src/tsg_proxy.cpp8
-rw-r--r--src/tsg_sync_state.cpp2
5 files changed, 9 insertions, 10 deletions
diff --git a/src/tsg_action.cpp b/src/tsg_action.cpp
index afa8c0f..3d58939 100644
--- a/src/tsg_action.cpp
+++ b/src/tsg_action.cpp
@@ -548,7 +548,7 @@ static unsigned char do_action_reset(const struct streaminfo *a_stream, struct m
int ret=MESA_rst_tcp((struct streaminfo *)a_stream, &rst_paras, sizeof(rst_paras));
if(ret<0)
{
- MASTER_LOG(g_tsg_para.logger, RLOG_LV_FATAL, LOG_MODULE_ACTION,
+ MASTER_LOG(g_tsg_para.logger, RLOG_LV_INFO, LOG_MODULE_ACTION,
"Send RST failed policy_id: %d service: %d action: %d addr: %s",
p_result->rule_id,
p_result->service_id,
diff --git a/src/tsg_bridge.cpp b/src/tsg_bridge.cpp
index acb289f..cd6b59e 100644
--- a/src/tsg_bridge.cpp
+++ b/src/tsg_bridge.cpp
@@ -250,7 +250,7 @@ int session_async_bridge_set_data(const struct streaminfo *a_stream, int bridge_
int ret=stream_bridge_async_data_put(a_stream, bridge_id, data);
if(ret<0)
{
- MASTER_LOG(g_tsg_para.logger, RLOG_LV_FATAL, LOG_MODULE_BRIDGE, "Add project failed, bridge_id: %d addr: %s", bridge_id, printaddr(&(a_stream->addr), a_stream->threadnum));
+ MASTER_LOG(g_tsg_para.logger, RLOG_LV_INFO, LOG_MODULE_BRIDGE, "Add project failed, bridge_id: %d addr: %s", bridge_id, printaddr(&(a_stream->addr), a_stream->threadnum));
return 0;
}
diff --git a/src/tsg_entry.cpp b/src/tsg_entry.cpp
index 20fde20..a3b3c0a 100644
--- a/src/tsg_entry.cpp
+++ b/src/tsg_entry.cpp
@@ -1940,7 +1940,7 @@ int session_app_gather_results_update(struct app_attributes **update_result, cha
{
if(identify_result->app_id_num<=0)
{
- return 0;
+ return update_result_num;
}
if(*update_result==NULL)
@@ -2005,7 +2005,6 @@ int session_app_identify_result_cb(const struct streaminfo *a_stream, int bridge
struct app_identify_result *identify_result=(struct app_identify_result *)data;
switch(identify_result->origin)
{
- break;
case ORIGIN_QM_ENGINE:
srt_process_context->is_app_link=FLAG_TRUE;
tsg_stat_sync_application_update(SYNC_APP_THRID, 1);
@@ -2054,7 +2053,7 @@ int session_app_identify_result_cb(const struct streaminfo *a_stream, int bridge
scan_app_num=1;
break;
default:
- MASTER_LOG(g_tsg_para.logger, RLOG_LV_FATAL, LOG_MODULE_SYNC_APP, "Unknown type: %d addr: %s", identify_result->origin, printaddr(&(a_stream->addr), a_stream->threadnum));
+ MASTER_LOG(g_tsg_para.logger, RLOG_LV_INFO, LOG_MODULE_SYNC_APP, "Unknown type: %d addr: %s", identify_result->origin, printaddr(&(a_stream->addr), a_stream->threadnum));
return 0;
}
diff --git a/src/tsg_proxy.cpp b/src/tsg_proxy.cpp
index 7e3bc9f..641a8d8 100644
--- a/src/tsg_proxy.cpp
+++ b/src/tsg_proxy.cpp
@@ -124,7 +124,7 @@ static void tsg_proxy_ip_header_parse(const void *a_packet, enum addr_type_t add
{
pktinfo->parse_failed=1;
char *errmsg = tsg_proxy_ipv6_errmsg_get((enum tsg_proxy_ipv6hdr_parse_error)ret);
- MASTER_LOG(g_tsg_para.logger, RLOG_LV_FATAL, LOG_MODULE_PROXY, "Failed at parse ipv6 header, errmsg = %s, stream treaceid = %llu", errmsg, tsg_get_stream_trace_id(stream));
+ MASTER_LOG(g_tsg_para.logger, RLOG_LV_INFO, LOG_MODULE_PROXY, "Failed at parse ipv6 header, errmsg = %s, stream treaceid = %llu", errmsg, tsg_get_stream_trace_id(stream));
}
}
else
@@ -134,7 +134,7 @@ static void tsg_proxy_ip_header_parse(const void *a_packet, enum addr_type_t add
{
pktinfo->parse_failed=1;
char *errmsg = tsg_proxy_ipv4_errmsg_get((enum tsg_proxy_ipv4hdr_parse_error)ret);
- MASTER_LOG(g_tsg_para.logger, RLOG_LV_FATAL, LOG_MODULE_PROXY, "Failed at parse ipv4 header, errmsg = %s, stream treaceid = %llu", errmsg, tsg_get_stream_trace_id(stream));
+ MASTER_LOG(g_tsg_para.logger, RLOG_LV_INFO, LOG_MODULE_PROXY, "Failed at parse ipv4 header, errmsg = %s, stream treaceid = %llu", errmsg, tsg_get_stream_trace_id(stream));
}
}
return;
@@ -262,7 +262,7 @@ static struct tsg_proxy_tcp_attribute *tsg_proxy_tcp_attribute_get(const struct
struct session_runtime_attribute *srt_attribute = (struct session_runtime_attribute *)session_runtime_attribute_new(stream);
if (srt_attribute == NULL)
{
- MASTER_LOG(g_tsg_para.logger, RLOG_LV_FATAL, LOG_MODULE_PROXY, "Failed to get session runtime attribute, stream treaceid = %llu", tsg_get_stream_trace_id(stream));
+ MASTER_LOG(g_tsg_para.logger, RLOG_LV_INFO, LOG_MODULE_PROXY, "Failed to get session runtime attribute, stream treaceid = %llu", tsg_get_stream_trace_id(stream));
return NULL;
}
@@ -351,7 +351,7 @@ void tsg_proxy_tcp_options_parse(const struct streaminfo *stream, const void *a_
tsg_proxy_ip_header_parse(a_packet, (enum addr_type_t)stream->addr.addrtype, stream, &pktinfo);
if (pktinfo.parse_failed)
{
- MASTER_LOG(g_tsg_para.logger, RLOG_LV_FATAL, LOG_MODULE_PROXY, "invalid ip header, bypass pkt");
+ MASTER_LOG(g_tsg_para.logger, RLOG_LV_INFO, LOG_MODULE_PROXY, "invalid ip header, bypass pkt");
return;
}
diff --git a/src/tsg_sync_state.cpp b/src/tsg_sync_state.cpp
index 0016743..b228629 100644
--- a/src/tsg_sync_state.cpp
+++ b/src/tsg_sync_state.cpp
@@ -37,7 +37,7 @@ static int mpack_send_pkt(const struct streaminfo *a_stream, mpack_writer_t *wri
mpack_complete_map(writer); // mpack_init_map
if (mpack_writer_destroy(writer) != mpack_ok)
{
- MASTER_LOG(g_tsg_para.logger, RLOG_LV_FATAL, LOG_MODULE_MPACK, "MPACK_WRITER An error occurred encoding the data!");
+ MASTER_LOG(g_tsg_para.logger, RLOG_LV_INFO, LOG_MODULE_MPACK, "MPACK_WRITER An error occurred encoding the data!");
return -1;
}