Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3b4db47008 | ||
|
|
5a2181eb1e |
17
.gitignore
vendored
Normal file
17
.gitignore
vendored
Normal 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
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/bin/sh
|
||||
work_path=$1
|
||||
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
|
||||
|
||||
@@ -242,8 +242,8 @@ extern "C" char FW_DNS_PLUG_ENTRY(stSessionInfo* session_info, void **pme, int
|
||||
}
|
||||
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);
|
||||
fw_dns_send_log(a_stream, dns_info, result, hit_num, thread_seq);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user