2 Commits

Author SHA1 Message Date
刘学利
3b4db47008 Update changelog.sh 2022-04-01 04:01:42 +00:00
“pengxuanzheng”
5a2181eb1e 🐞 fix(TSG-9466): 命中monitor时,先notify命中monitor结果,然后再发送日志 2022-04-01 03:52:55 +00:00
3 changed files with 19 additions and 2 deletions

17
.gitignore vendored Normal file
View File

@@ -0,0 +1,17 @@
SI/
*.log
*.o
*.so
*.si4project/
*.a
*.d
build/
.vscode
.idea
core.*
cmake-build-*
GPATH
GTAGS
GRTAGS
src/tags
version.txt

View File

@@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
work_path=$1 work_path=$1
branch=`git status | grep branch | awk '{print $NF}'` branch=`git status | grep branch | awk '{print $NF}'`
git log --branches=$branch --no-merges --date=local --show-signature --pretty="* %ad %an %ae %nhash: %H%ncommit:%n%B" | awk -F"-" '{print "- "$0}' | sed 's/- \*/\*/g' | sed 's/- $//g' | sed 's/-/ -/g' | sed 's/[0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}//g' > $work_path/changelog.txt git log --branches=$branch --no-merges --date=local --show-signature --pretty="* %cd %an %ae %nhash: %H%ncommit:%n%B" | awk -F"-" '{print "- "$0}' | sed 's/- \*/\*/g' | sed 's/- $//g' | sed 's/-/ -/g' | sed 's/[0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}//g' > $work_path/changelog.txt

View File

@@ -242,8 +242,8 @@ extern "C" char FW_DNS_PLUG_ENTRY(stSessionInfo* session_info, void **pme, int
} }
else else
{ {
fw_dns_send_log(a_stream, dns_info, result, hit_num, thread_seq);
tsg_notify_hited_monitor_result(a_stream, result, hit_num, thread_seq); tsg_notify_hited_monitor_result(a_stream, result, hit_num, thread_seq);
fw_dns_send_log(a_stream, dns_info, result, hit_num, thread_seq);
} }
} }