Change timeout of streams to make dash more responsive
This commit is contained in:
parent
eab8c03cce
commit
13ac1a4045
@ -397,6 +397,21 @@ def stream_trimmer_loop():
|
|||||||
fin_list.append(stream_id)
|
fin_list.append(stream_id)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
try:
|
||||||
|
if '_to' not in systems[system].STATUS[stream_id] and '_fin' not in systems[system].STATUS[stream_id] and systems[system].STATUS[stream_id]['LAST'] < _now - 5:
|
||||||
|
systems[system].STATUS[stream_id]['_fin'] = True
|
||||||
|
logger.info('(%s) *TIME OUT* STREAM ID: %s SUB: %s PEER: %s TGID: %s TS 1 Duration: %.2f', \
|
||||||
|
system, int_id(stream_id), get_alias(int_id(_stream['RFS']), subscriber_ids), get_alias(int_id(_sysconfig['NETWORK_ID']), peer_ids), get_alias(int_id(_stream['TGID']), talkgroup_ids), _stream['LAST'] - _stream['START'])
|
||||||
|
if CONFIG['REPORTS']['REPORT']:
|
||||||
|
systems[system]._report.send_bridgeEvent('GROUP VOICE,END,RX,{},{},{},{},{},{},{:.2f}'.format(system, int_id(stream_id), int_id(_sysconfig['NETWORK_ID']), int_id(_stream['RFS']), 1, int_id(_stream['TGID']), _stream['LAST'] - _stream['START']).encode(encoding='utf-8', errors='ignore'))
|
||||||
|
systems[system].STATUS[stream_id]['_to'] = True
|
||||||
|
continue
|
||||||
|
except:
|
||||||
|
logger.warning("(%s) Keyerror - stream trimmer Stream ID: %s",system,stream_id)
|
||||||
|
systems[system].STATUS[stream_id]['LAST'] = _now
|
||||||
|
continue
|
||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if systems[system].STATUS[stream_id]['LAST'] < _now - 60:
|
if systems[system].STATUS[stream_id]['LAST'] < _now - 60:
|
||||||
remove_list.append(stream_id)
|
remove_list.append(stream_id)
|
||||||
@ -413,10 +428,7 @@ def stream_trimmer_loop():
|
|||||||
if stream_id in systems[system].STATUS:
|
if stream_id in systems[system].STATUS:
|
||||||
_stream = systems[system].STATUS[stream_id]
|
_stream = systems[system].STATUS[stream_id]
|
||||||
_sysconfig = CONFIG['SYSTEMS'][system]
|
_sysconfig = CONFIG['SYSTEMS'][system]
|
||||||
logger.info('(%s) *TIME OUT* STREAM ID: %s SUB: %s PEER: %s TGID: %s TS 1 Duration: %.2f', \
|
|
||||||
system, int_id(stream_id), get_alias(int_id(_stream['RFS']), subscriber_ids), get_alias(int_id(_sysconfig['NETWORK_ID']), peer_ids), get_alias(int_id(_stream['TGID']), talkgroup_ids), _stream['LAST'] - _stream['START'])
|
|
||||||
if CONFIG['REPORTS']['REPORT']:
|
|
||||||
systems[system]._report.send_bridgeEvent('GROUP VOICE,END,RX,{},{},{},{},{},{},{:.2f}'.format(system, int_id(stream_id), int_id(_sysconfig['NETWORK_ID']), int_id(_stream['RFS']), 1, int_id(_stream['TGID']), _stream['LAST'] - _stream['START']).encode(encoding='utf-8', errors='ignore'))
|
|
||||||
removed = systems[system].STATUS.pop(stream_id)
|
removed = systems[system].STATUS.pop(stream_id)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@ -1319,7 +1331,7 @@ class routerOBP(OPENBRIDGE):
|
|||||||
|
|
||||||
if CONFIG['SYSTEMS'][self._system]['ENHANCED_OBP'] and '_bcsq' not in self.STATUS[_stream_id]:
|
if CONFIG['SYSTEMS'][self._system]['ENHANCED_OBP'] and '_bcsq' not in self.STATUS[_stream_id]:
|
||||||
systems[self._system].send_bcsq(_dst_id,_stream_id)
|
systems[self._system].send_bcsq(_dst_id,_stream_id)
|
||||||
logger.warning("(%s) OBP *BridgeControl* Sent BCSQ , STREAM ID: %s, TG %s",self._system, int_id(_stream_id), int_id(_dst_id))
|
#logger.warning("(%s) OBP *BridgeControl* Sent BCSQ , STREAM ID: %s, TG %s",self._system, int_id(_stream_id), int_id(_dst_id))
|
||||||
self.STATUS[_stream_id]['_bcsq'] = True
|
self.STATUS[_stream_id]['_bcsq'] = True
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user