Skip to content

Raise Memory Error instead of restarting which caused bootloop #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 4, 2021
Merged

Raise Memory Error instead of restarting which caused bootloop #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions adafruit_portalbase/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
from adafruit_fakerequests import Fake_Requests

try:
import supervisor
except ImportError:
supervisor = None

try:
import rtc
except ImportError:
Expand Down Expand Up @@ -109,7 +104,6 @@ def __init__(
else:
self._secrets = secrets

# This may be removed. Using for testing
self.requests = None

try:
Expand Down Expand Up @@ -548,10 +542,10 @@ def _parse_data(
except ValueError: # failed to parse?
print("Couldn't parse json: ", response.text)
raise
except MemoryError:
if supervisor is not None:
supervisor.reload()
raise
except MemoryError as error:
raise MemoryError(
"{} (data is likely too large)".format(error)
) from error

if content_type == CONTENT_JSON:
values = self.process_json(json_out, json_path)
Expand Down