Compare commits

...

2 Commits

Author SHA1 Message Date
thsw 40ad91a5fa 20220719更新僵尸进程处理 2022-07-19 15:24:09 +08:00
thsw 1d70ce4b22 20220719更新僵尸进程处理 2022-07-19 15:23:38 +08:00
70 changed files with 26609 additions and 9 deletions

View File

@ -291,7 +291,7 @@ def test5(par):
msg['error']='video uploading failure' msg['error']='video uploading failure'
if upLoaded: if upLoaded:
if typename=='结束': msg["status"]="success" if typename=='结束': msg["status"]="success"
else: msg["status"]="success_timeout" else: msg["status"]="timeout"
else: else:
msg["status"]='failed' msg["status"]='failed'
time_s2 = time.time() time_s2 = time.time()

Binary file not shown.

View File

@ -1,8 +1,8 @@
{ {
"par":{ "par":{
"server1":"212.129.223.66:19092", "server1":"212.129.223.66:19092",
"server":"101.132.127.1:19092", "server2":"101.132.127.1:19092",
"server3":"192.168.11.242:9092", "server":"192.168.11.242:9092",
"topic": ["alg-online-tasks","alg-offline-tasks","alg-task-results"], "topic": ["alg-online-tasks","alg-offline-tasks","alg-task-results"],
"group_id":"testWw", "group_id":"testWw",
"kafka":"mintors/kafka", "kafka":"mintors/kafka",

View File

@ -14,6 +14,6 @@
"AId":"LTAI5tE7KWN9fsuGU7DyfYF4", "AId":"LTAI5tE7KWN9fsuGU7DyfYF4",
"ASt":"yPPCyfsqWgrTuoz5H4sisY0COclx8E" "ASt":"yPPCyfsqWgrTuoz5H4sisY0COclx8E"
}, },
"kafkaPar":{"boostServer1":["192.168.11.242:9092"] ,"boostServer":["101.132.127.1:19092"], "boostServer3":["212.129.223.66:9092"] ,"topic":"alg-task-results"} "kafkaPar":{"boostServer":["192.168.11.242:9092"] ,"boostServer2":["101.132.127.1:19092"], "boostServer3":["212.129.223.66:9092"] ,"topic":"alg-task-results"}
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

2
master.log Normal file
View File

@ -0,0 +1,2 @@
{'server1': '212.129.223.66:19092', 'server2': '101.132.127.1:19092', 'server': '192.168.11.242:9092', 'topic': ['alg-online-tasks', 'alg-offline-tasks', 'alg-task-results'], 'group_id': 'testWw', 'kafka': 'mintors/kafka', 'modelJson': 'conf/model.json', 'logDir': 'logs/master', 'StreamWaitingTime': 240, 'logPrintInterval': 60}
2022-07-19 15:11:14.016 [INFO][master:detector][434][logs.master.detector.log]- detector process starts

View File

@ -545,6 +545,13 @@ def detector(par):
time.sleep(timeSleep) time.sleep(timeSleep)
####检查gpu子进程是否结束如果结束要join(),否则会产生僵尸进程###
#taskStatus['pidInfos'][gpuProcess.pid] = {'gpuProcess':gpuProcess,'type':'onLine','taskInfos':taskInfos}
for key in list(taskStatus['pidInfos'].keys()):
if not taskStatus['pidInfos'][key]['gpuProcess'].is_alive():
taskStatus['pidInfos'][key]['gpuProcess'].join()
taskStatus['pidInfos'].pop(key)
print('########Program End#####') print('########Program End#####')

View File

@ -12,8 +12,8 @@ def producer_demo():
#topic_on='thsw';topic_off='thsw2'; #topic_on='thsw';topic_off='thsw2';
#server=['212.129.223.66:19092']; #server=['212.129.223.66:19092'];
server=['101.132.127.1:19092'] #server=['101.132.127.1:19092']
server=['192.168.11.242:9092']
topic_on='alg-online-tasks';topic_off='alg-offline-tasks' topic_on='alg-online-tasks';topic_off='alg-offline-tasks'
# 假设生产的消息为键值对不是一定要键值对且序列化方式为json # 假设生产的消息为键值对不是一定要键值对且序列化方式为json
producer = KafkaProducer( producer = KafkaProducer(
@ -25,8 +25,8 @@ def producer_demo():
#pull_channel = "rtmp://live.play.t-aaron.com/live/THSA" #pull_channel = "rtmp://live.play.t-aaron.com/live/THSA"
#push_channel = 'rtmp://live.push.t-aaron.com/live/THSB' #push_channel = 'rtmp://live.push.t-aaron.com/live/THSB'
#pull_channel = 'rtmp://live.play.t-aaron.com/live/THSAa_hd' #pull_channel = 'rtmp://live.play.t-aaron.com/live/THSAa_hd'
pull_channel = 'http://live.play.t-aaron.com/live/THSAa_hd.m3u8' pull_channel = 'http://live.play.t-aaron.com/live/THSAl_hd.m3u8'
push_channel = "rtmp://live.push.t-aaron.com/live/THSBa" push_channel = "rtmp://live.push.t-aaron.com/live/THSBd"
else: else:
pull_channel = "rtmp://demoplay.yunhengzhizao.cn/live/THSA_HD5M" pull_channel = "rtmp://demoplay.yunhengzhizao.cn/live/THSA_HD5M"
push_channel = "rtmp://127.0.0.1:1935/live/test" push_channel = "rtmp://127.0.0.1:1935/live/test"

5039
send.log Normal file

File diff suppressed because it is too large Load Diff