Merge pull request #2197 from tekktrik/dev/fix-logging-changes

Dev/fix-logging-changes

Author: ladyada

CircuitPython_Logger/aio_handler/code.py

@@ -25,13 +25,13 @@
 # l = logging.getLogger('aio')
 # # Pass in the device object based on portal_base
 # # (Funhouse, PyPortal, MagTag, etc) as the 2nd parameter
-# l.addHandler(AIOHandler('test'), portal_device)
+# l.addHandler(AIOHandler('test', portal_device))
 # l.level = logging.ERROR
 # l.error("test")
 
-from adafruit_logging import LoggingHandler
+from adafruit_logging import Handler
 
-class AIOHandler(LoggingHandler):
+class AIOHandler(Handler):
 
     def __init__(self, name, portal_device):
         """Create an instance."""
@@ -41,11 +41,9 @@ def __init__(self, name, portal_device):
         self._portal_device = portal_device
 
 
-    def emit(self, level, msg):
+    def emit(self, record):
         """Generate the message and write it to the AIO Feed.
 
-        :param level: The level at which to log
-        :param msg: The core message
-
+        :param record: The record (message object) to be logged
         """
-        self._portal_device.push_to_io(self._log_feed_name, self.format(level, msg))
+        self._portal_device.push_to_io(self._log_feed_name, self.format(record))

CircuitPython_Logger/aio_test/code.py

@@ -11,7 +11,7 @@
 device=PyPortal()
 
 l = logging.getLogger('aio')
-l.addHandler(AIOHandler('test'), device)
+l.addHandler(AIOHandler('test', device))
 
 def go():
     while True:

CircuitPython_Logger/ble_handler/code.py

@@ -17,39 +17,34 @@
 """
 
 
-from adafruit_logging import LoggingHandler
+from adafruit_logging import Handler
 from adafruit_ble.uart import UARTServer
 
-class BLEHandler(LoggingHandler):
+class BLEHandler(Handler):
     """Send logging output to the BLE uart port."""
 
     def __init__(self):
         """Create an instance.
 
         :param uart: the busio.UART instance to which to write messages
-
         """
         self._advertising_now = False
         self._uart = UARTServer()
         self._uart.start_advertising()
 
-    def format(self, level, msg):
+    def format(self, record):
         """Generate a string to log.
 
-        :param level: The level at which to log
-        :param msg: The core message
-
+        :param record: The record (message object) to be logged
         """
-        return super().format(level, msg) + '\r\n'
+        return super().format(record) + '\r\n'
 
-    def emit(self, level, msg):
+    def emit(self, record):
         """Generate the message and write it to the UART.
 
-        :param level: The level at which to log
-        :param msg: The core message
-
+        :param record: The record (message object) to be logged
         """
         while not self._uart.connected:
             pass
-        data = bytes(self.format(level, msg), 'utf-8')
+        data = bytes(self.format(record), 'utf-8')
         self._uart.write(data)

CircuitPython_Logger/file_handler/code.py

@@ -0,0 +1,45 @@
+# SPDX-FileCopyrightText: 2022 Alec Delaney for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+import time
+import random
+import board
+import busio
+from digitalio import DigitalInOut
+import storage
+import adafruit_sdcard
+import adafruit_logging as logging
+
+# Get chip select pin depending on the board, this one is for the Feather M4 Express
+sd_cs = board.D10
+
+# Set up an SD card to write to
+spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
+cs = DigitalInOut(sd_cs)
+sdcard = adafruit_sdcard.SDCard(spi, cs)
+vfs = storage.VfsFat(sdcard)
+storage.mount(vfs, "/sd")
+
+l = logging.getLogger('file')
+l.addHandler(logging.FileHandler('/sd/test.txt'))
+
+def go():
+    while True:
+        t = random.randint(1, 5)
+        if t == 1:
+            print('debug')
+            l.debug("debug message: %d", random.randint(0, 1000))
+        elif t == 2:
+            print('info')
+            l.info("info message: %d", random.randint(0, 1000))
+        elif t == 3:
+            print('warning')
+            l.warning("warning message: %d", random.randint(0, 1000))
+        elif t == 4:
+            print('error')
+            l.error("error message: %d", random.randint(0, 1000))
+        elif t == 5:
+            print('critical')
+            l.critical("critical message: %d", random.randint(0, 1000))
+        time.sleep(5.0 + (random.random() * 5.0))

CircuitPython_Logger/file_test/code.py

@@ -30,33 +30,28 @@
 # logger.level = logging.INFO
 # logger.info('testing')
 
-from adafruit_logging import LoggingHandler
+from adafruit_logging import Handler
 
-class UartHandler(LoggingHandler):
+class UartHandler(Handler):
     """Send logging output to a serial port."""
 
     def __init__(self, uart):
         """Create an instance.
 
         :param uart: the busio.UART instance to which to write messages
-
         """
         self._uart = uart
 
-    def format(self, level, msg):
+    def format(self, record):
         """Generate a string to log.
 
-        :param level: The level at which to log
-        :param msg: The core message
-
+        :param record: The record (message object) to be logged
         """
-        return super().format(level, msg) + '\r\n'
+        return super().format(record) + '\r\n'
 
-    def emit(self, level, msg):
+    def emit(self, record):
         """Generate the message and write it to the UART.
 
-        :param level: The level at which to log
-        :param msg: The core message
-
+        :param record: The record (message object) to be logged
         """
-        self._uart.write(bytes(self.format(level, msg), 'utf-8'))
+        self._uart.write(bytes(self.format(record), 'utf-8'))

CircuitPython_Logger/uart_handler/code.py

@@ -59,7 +59,10 @@ class TouchscreenPoller(object):
     """Get 'pressed' and location updates from a touch screen device."""
 
     def __init__(self, splash, cursor_bmp):
-        logging.getLogger("Paint").debug("Creating a TouchscreenPoller")
+        logger = logging.getLogger("Paint")
+        if not logger.hasHandlers():
+            logger.addHandler(logging.StreamHandler())
+        logger.debug("Creating a TouchscreenPoller")
         self._display_grp = splash
         self._touchscreen = adafruit_touchscreen.Touchscreen(
             board.TOUCH_XL, board.TOUCH_XR,
@@ -118,14 +121,16 @@ class CursorPoller(object):
     """Get 'pressed' and location updates from a D-Pad/joystick device."""
 
     def __init__(self, splash, cursor_bmp):
-        logging.getLogger("Paint").debug("Creating a CursorPoller")
+        self._logger = logging.getLogger("Paint")
+        if not self._logger.hasHandlers():
+            self._logger.addHandler(logging.StreamHandler())
+        self._logger.debug("Creating a CursorPoller")
         self._mouse_cursor = Cursor(
             board.DISPLAY, display_group=splash, bmp=cursor_bmp, cursor_speed=2
         )
         self._x_offset = cursor_bmp.width // 2
         self._y_offset = cursor_bmp.height // 2
         self._cursor = DebouncedCursorManager(self._mouse_cursor)
-        self._logger = logging.getLogger("Paint")
 
     def poll(self):
         """Check for input. Returns press of A (a bool), B,
@@ -160,6 +165,8 @@ def set_cursor_bitmap(self, bmp):
 class Paint(object):
     def __init__(self, display=board.DISPLAY):
         self._logger = logging.getLogger("Paint")
+        if not self._logger.hasHandlers():
+            self._logger.addHandler(logging.StreamHandler())
         self._logger.setLevel(logging.DEBUG)
         self._display = display
         self._w = self._display.width

CircuitPython_PyPaint/code.py

@@ -27,6 +27,8 @@
 import rtc
 
 logger = logging.getLogger('main')
+if not logger.hasHandlers():
+    logger.addHandler(logging.StreamHandler())
 
 TIME_SERVICE = "https://io.adafruit.com/api/v2/%s/integrations/time/strftime?x-aio-key=%s"
 # our strftime is %Y-%m-%d %H:%M:%S.%L %j %u %z %Z see http://strftime.net/ for decoding details

IoT_Environment_Sensor/aio.py

@@ -24,6 +24,8 @@
     import ustruct as struct
 
 logger = logging.getLogger('main')
+if not logger.hasHandlers():
+    logger.addHandler(logging.StreamHandler())
 
 class AirQualitySensor (object):
 

IoT_Environment_Sensor/air_quality.py

@@ -26,6 +26,8 @@
 import adafruit_logging as logging
 
 logger = logging.getLogger('main')
+if not logger.hasHandlers():
+    logger.addHandler(logging.StreamHandler())
 logger.setLevel(logging.INFO)
 
 gps_uart = busio.UART(board.TX, board.RX, baudrate=9600, timeout=3.000)