From 8116fe38e1d602a131c296a76107bdef3f674dea Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 24 Jan 2021 18:56:33 +0000 Subject: [PATCH] Add handling of occasional exception in dmrbits.tobytes() in HBP class --- bridge_master.py | 6 +++++- docker-configs/{Dockerfile => Dockerfile-base} | 2 +- docker-configs/{entrypoint => entrypoint-base} | 0 3 files changed, 6 insertions(+), 2 deletions(-) rename docker-configs/{Dockerfile => Dockerfile-base} (92%) rename docker-configs/{entrypoint => entrypoint-base} (100%) diff --git a/bridge_master.py b/bridge_master.py index c59902e..ce24eec 100755 --- a/bridge_master.py +++ b/bridge_master.py @@ -1401,7 +1401,11 @@ class routerHBP(HBSYSTEM): # Create a Burst B-E packet (Embedded LC) elif _dtype_vseq in [1,2,3,4]: dmrbits = dmrbits[0:116] + _target_status[_target['TS']]['TX_EMB_LC'][_dtype_vseq] + dmrbits[148:264] - dmrpkt = dmrbits.tobytes() + try: + dmrpkt = dmrbits.tobytes() + except AttributeError: + logger.debug('(%s) AttributeError - dmrbits.tobytes()',self._system) + _tmp_data = b''.join([_tmp_data, dmrpkt, _data[53:55]]) # Transmit the packet to the destination system diff --git a/docker-configs/Dockerfile b/docker-configs/Dockerfile-base similarity index 92% rename from docker-configs/Dockerfile rename to docker-configs/Dockerfile-base index d12d380..29b4176 100644 --- a/docker-configs/Dockerfile +++ b/docker-configs/Dockerfile-base @@ -1,6 +1,6 @@ FROM python:3.7-alpine -COPY entrypoint /entrypoint +COPY entrypoint-base /entrypoint RUN adduser -D -u 54000 radio && \ apk update && \ diff --git a/docker-configs/entrypoint b/docker-configs/entrypoint-base similarity index 100% rename from docker-configs/entrypoint rename to docker-configs/entrypoint-base