gfwleak/tsg-cli-deploy
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

killall -9增加-q选项, 无进程存在时, 也不打印错误消息

Browse Source
This commit is contained in:
lijia
2019-09-20 20:52:36 +08:00
parent 044c0d2b61
commit e948ec211c
6 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
hosts.xxg Normal file
View File

@@ -0,0 +1,28 @@
[all:vars]
ansible_user=root
rpm_file_name=tsg-cli-1.0.7-1.el7.x86_64.rpm
[sled-mxn]
192.168.40.165 SN=CBT2201925000001
[sled-mcn0]
192.168.40.161 SN=CBT2201925000001
[sled-mcn1]
192.168.40.162 SN=CBT2201925000001
[sled-mcn2]
192.168.40.163 SN=CBT2201925000001
[sled-mcn3]
192.168.40.164 SN=CBT2201925000001
[tsg-all:children]
sled-mxn
sled-mcn0
sled-mcn1
sled-mcn2
sled-mcn3

18
roles/tsg-cli-mcn0/files/tsg-monitor.sh
View File

@@ -7,16 +7,16 @@
#否则长时间运行后, 会有大量后台进程运行 #否则长时间运行后, 会有大量后台进程运行
killall_uncompleted_cmd(){ killall_uncompleted_cmd(){
#killall -9 tsg_cluster_register #killall -9 tsg_cluster_register
killall -9 tsg_diagnose_background killall -9 -q tsg_diagnose_background
killall -9 tsg_update_tags killall -9 -q tsg_update_tags
killall -9 tsg_monit_app killall -9 -q tsg_monit_app
killall -9 tsg_monit_intercept killall -9 -q tsg_monit_intercept
killall -9 tsg_monit_interface killall -9 -q tsg_monit_interface
killall -9 tsg_monit_protocol_v3 killall -9 -q tsg_monit_protocol_v3
killall -9 tsg_monit_protocol_v4 killall -9 -q tsg_monit_protocol_v4
killall -9 tsg_monit_stream_v3 killall -9 -q tsg_monit_stream_v3
killall -9 tsg_monit_stream_v4 killall -9 -q tsg_monit_stream_v4
} }
start_background_cmd(){ start_background_cmd(){

6
roles/tsg-cli-mcn1/files/tsg-monitor.sh
View File

@@ -7,9 +7,9 @@
#否则长时间运行后, 会有大量后台进程运行 #否则长时间运行后, 会有大量后台进程运行
killall_uncompleted_cmd(){ killall_uncompleted_cmd(){
#killall -9 tsg_cluster_register #killall -9 tsg_cluster_register
killall -9 tsg_diagnose_background killall -9 -q tsg_diagnose_background
killall -9 tsg_update_tags killall -9 -q tsg_update_tags
killall -9 tsg_monit_interface killall -9 -q tsg_monit_interface
} }

6
roles/tsg-cli-mcn2/files/tsg-monitor.sh
View File

@@ -7,9 +7,9 @@
#否则长时间运行后, 会有大量后台进程运行 #否则长时间运行后, 会有大量后台进程运行
killall_uncompleted_cmd(){ killall_uncompleted_cmd(){
#killall -9 tsg_cluster_register #killall -9 tsg_cluster_register
killall -9 tsg_diagnose_background killall -9 -q tsg_diagnose_background
killall -9 tsg_update_tags killall -9 -q tsg_update_tags
killall -9 tsg_monit_interface killall -9 -q tsg_monit_interface
} }

8
roles/tsg-cli-mcn3/files/tsg-monitor.sh
View File

@@ -6,10 +6,10 @@
#导致10秒内还不结束, 强行杀掉, #导致10秒内还不结束, 强行杀掉,
#否则长时间运行后, 会有大量后台进程运行 #否则长时间运行后, 会有大量后台进程运行
killall_uncompleted_cmd(){ killall_uncompleted_cmd(){
#killall -9 tsg_cluster_register #killall -9 -q tsg_cluster_register
killall -9 tsg_diagnose_background killall -9 -q tsg_diagnose_background
killall -9 tsg_update_tags killall -9 -q tsg_update_tags
killall -9 tsg_monit_interface killall -9 -q tsg_monit_interface
} }

6
roles/tsg-cli-mxn/files/tsg-monitor.sh
View File

@@ -6,9 +6,9 @@
#导致10秒内还不结束, 要强行杀掉, #导致10秒内还不结束, 要强行杀掉,
#否则长时间运行后, 会有大量后台进程运行! #否则长时间运行后, 会有大量后台进程运行!
killall_uncompleted_cmd(){ killall_uncompleted_cmd(){
killall -9 tsg_cluster_register killall -9 -q tsg_cluster_register
#killall -9 tsg_diagnose_background #killall -9 -q tsg_diagnose_background
killall -9 tsg_update_tags killall -9 -q tsg_update_tags
} }
start_background_cmd(){ start_background_cmd(){