fix: Enhance Discord message sending with memory checks and scheduling

This commit is contained in:
Aaron 2025-11-15 09:36:44 -05:00
parent 13e3a56fa6
commit d2c0f68488
2 changed files with 55 additions and 14 deletions

View File

@ -51,16 +51,24 @@ def send_discord_message(message, username="Auto Garden Bot", is_alert=False):
# 1) Free heap before TLS # 1) Free heap before TLS
import gc # type: ignore import gc # type: ignore
gc.collect() gc.collect()
gc.collect() # run twice as a precaution
# 1b) quick mem check - avoid importing urequests/TLS when too low
try: try:
# If MicroPython provides mem_free, skip send if heap is very low mem = getattr(gc, "mem_free", lambda: None)()
# TLS can be spiky and fragmented; be conservative. if mem is not None and mem < 90000: # conservative threshold (adjust to your board)
if hasattr(gc, "mem_free") and gc.mem_free() < 100000: # ~100KB threshold
return False return False
except: except:
pass pass
# 2) Import urequests locally (keeps RAM free when idle) try:
import urequests as requests # type: ignore # 2) Import urequests locally (keeps RAM free when idle)
import urequests as requests # type: ignore
except Exception as e:
# if import fails due to ENOMEM or missing module, back off
print("Discord webhook import failed:", e)
return False
gc.collect() # collect again after import to reduce fragmentation gc.collect() # collect again after import to reduce fragmentation
# 3) Keep payload tiny # 3) Keep payload tiny
@ -97,7 +105,13 @@ def send_discord_message(message, username="Auto Garden Bot", is_alert=False):
pass pass
# Free refs and force GC # Free refs and force GC
try: try:
del resp, body_bytes, requests # only delete names if they exist
if 'resp' in locals():
del resp
if 'body_bytes' in locals():
del body_bytes
if 'requests' in locals():
del requests
except: except:
pass pass
try: try:

43
main.py
View File

@ -200,16 +200,16 @@ if wifi and wifi.isconnected():
print(f"Web Interface: http://{ifconfig[0]}") print(f"Web Interface: http://{ifconfig[0]}")
print("="*50 + "\n") print("="*50 + "\n")
# Send startup notification to Discord (with timeout, non-blocking) # Send startup notification to Discord (schedule for later to avoid ENOMEM)
try: try:
gc.collect() # free heap before HTTPS gc.collect() # free heap before HTTPS attempt
success = discord_webhook.send_discord_message(f"Pico W online at http://{ifconfig[0]}") # don't attempt HTTP/TLS immediately — schedule for retry from main loop
if success: pending_discord_message = "Pico W online at http://{}".format(ifconfig[0])
print("Discord startup notification sent") discord_send_attempts = 0
else: discord_sent = False
print("Discord startup notification failed (continuing anyway)") print("Startup discord message queued (will send when memory available)")
except Exception as e: except Exception as e:
print("Discord notification error: {}".format(e)) print("Discord notification scheduling error: {}".format(e))
# Start web server early so page can load even if time sync is slow # Start web server early so page can load even if time sync is slow
web_server = TempWebServer(port=80) web_server = TempWebServer(port=80)
@ -234,6 +234,8 @@ else:
print("="*50 + "\n") print("="*50 + "\n")
# ===== END: WiFi Connection ===== # ===== END: WiFi Connection =====
# ===== START: Sensor Configuration ===== # ===== START: Sensor Configuration =====
# Define all temperature sensors and their alert thresholds # Define all temperature sensors and their alert thresholds
SENSOR_CONFIG = { SENSOR_CONFIG = {
@ -398,6 +400,31 @@ last_ntp_sync = time.time() # Track when we last synced
# Main monitoring loop (runs forever until Ctrl+C) # Main monitoring loop (runs forever until Ctrl+C)
while True: while True:
try: try:
# Try to send pending discord startup message when memory permits
try:
if not globals().get('discord_sent', True) and globals().get('pending_discord_message'):
import gc as _gc # type: ignore
# require a conservative free memory threshold before TLS (adjust to your device)
mem_ok = getattr(_gc, 'mem_free', lambda: 0)() > 90000
if mem_ok:
try:
ok = discord_webhook.send_discord_message(pending_discord_message)
if ok:
print("Discord startup notification sent")
discord_sent = True
else:
discord_send_attempts += 1
if discord_send_attempts >= 3:
print("Discord startup notification failed after retries")
discord_sent = True
except Exception as e:
print("Discord notification error: {}".format(e))
discord_send_attempts += 1
if discord_send_attempts >= 3:
discord_sent = True
except Exception:
pass
# Run all monitors (each checks if it's time to run via should_run()) # Run all monitors (each checks if it's time to run via should_run())
run_monitors(monitors) run_monitors(monitors)