hemna/aprsd
1
0
Fork 0
mirror of https://github.com/craigerl/aprsd.git synced 2024-11-25 09:28:38 -05:00
Code Issues Projects Releases Wiki Activity

Fix a small issue with packet sending failures

Browse Source 
When a packet _send_direct() failed to send due to a network
timeout or client issue, we don't want to count that as a send
attempt for the packet.  This patch catches that and allows for
another retry.
This commit is contained in:
Hemna 2024-10-31 17:39:04 -04:00
parent fbfac97140
commit 3fd606946d
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
aprsd/cmds/admin.py
View File

@ -14,7 +14,10 @@ from aprsd.main import cli
os.environ["APRSD_ADMIN_COMMAND"] = "1" os.environ["APRSD_ADMIN_COMMAND"] = "1"
from aprsd import wsgi as aprsd_wsgi # this import has to happen AFTER we set the
# above environment variable, so that the code
# inside the wsgi.py has the value
from aprsd import wsgi as aprsd_wsgi # noqa
CONF = cfg.CONF CONF = cfg.CONF

30
aprsd/threads/tx.py
View File

@ -89,6 +89,9 @@ def _send_direct(packet, aprs_client=None):
except Exception as e: except Exception as e:
LOG.error(f"Failed to send packet: {packet}") LOG.error(f"Failed to send packet: {packet}")
LOG.error(e) LOG.error(e)
return False
else:
return True
class SendPacketThread(aprsd_threads.APRSDThread): class SendPacketThread(aprsd_threads.APRSDThread):
@ -150,8 +153,17 @@ class SendPacketThread(aprsd_threads.APRSDThread):
# no attempt time, so lets send it, and start # no attempt time, so lets send it, and start
# tracking the time. # tracking the time.
packet.last_send_time = int(round(time.time())) packet.last_send_time = int(round(time.time()))
_send_direct(packet) sent = False
packet.send_count += 1 try:
sent = _send_direct(packet)
except Exception:
LOG.error(f"Failed to send packet: {packet}")
else:
# If an exception happens while sending
# we don't want this attempt to count
# against the packet
if sent:
packet.send_count += 1
time.sleep(1) time.sleep(1)
# Make sure we get called again. # Make sure we get called again.
@ -199,8 +211,18 @@ class SendAckThread(aprsd_threads.APRSDThread):
send_now = True send_now = True
if send_now: if send_now:
_send_direct(self.packet) sent = False
self.packet.send_count += 1 try:
sent = _send_direct(self.packet)
except Exception:
LOG.error(f"Failed to send packet: {self.packet}")
else:
# If an exception happens while sending
# we don't want this attempt to count
# against the packet
if sent:
self.packet.send_count += 1
self.packet.last_send_time = int(round(time.time())) self.packet.last_send_time = int(round(time.time()))
time.sleep(1) time.sleep(1)

1
aprsd/wsgi.py
View File

@ -269,7 +269,6 @@ def init_app(config_file=None, log_level=None):
return log_level return log_level
print(f"__name__ = {__name__}")
if __name__ == "__main__": if __name__ == "__main__":
async_mode = "threading" async_mode = "threading"