Skip to content
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.

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

fix: use a lifx lib logger instead of root and suppress #822

Merged
merged 2 commits into from
Mar 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions ledfx/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ def setup_logging(loglevel, config_dir):
logging.getLogger("sacn").setLevel(logging.WARNING)
logging.getLogger("aiohttp.access").setLevel(logging.WARNING)
logging.getLogger("zeroconf").setLevel(logging.WARNING)
logging.getLogger("lifxdev").setLevel(logging.WARNING)

global _LOGGER
_LOGGER = logging.getLogger(__name__)
Expand Down
6 changes: 6 additions & 0 deletions ledfx/libraries/lifxdev/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
"""lifxdev"""

import logging


def get_library_logger():
return logging.getLogger("lifxdev")
10 changes: 6 additions & 4 deletions ledfx/libraries/lifxdev/devices/device_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,19 @@
import dataclasses
import enum
import functools
import logging
import pathlib
from collections.abc import Callable
from typing import Any

import yaml

from ledfx.libraries.lifxdev import get_library_logger
from ledfx.libraries.lifxdev.colors import color
from ledfx.libraries.lifxdev.devices import device, light, multizone, tile
from ledfx.libraries.lifxdev.messages import device_messages, packet

logger = get_library_logger()

CONFIG_PATH = pathlib.Path.home() / ".lifx" / "devices.yaml"


Expand Down Expand Up @@ -225,7 +227,7 @@ def discover(self, num_retries: int = 10) -> dict[str, ProductInfo]:
num_retries: (int) Number of GetService calls made.
"""

logging.info("Scanning for LIFX devices.")
logger.info("Scanning for LIFX devices.")
state_service_dict: dict[str, packet.LifxResponse] = {}
# Disabling the timeout speeds up discovery
for _ in range(num_retries):
Expand All @@ -234,15 +236,15 @@ def discover(self, num_retries: int = 10) -> dict[str, ProductInfo]:
ip = response.addr[0]
state_service_dict[ip] = response

logging.info("Getting device info for discovered devices.")
logger.info("Getting device info for discovered devices.")
device_dict: dict[str, ProductInfo] = {}
for ip, state_service in state_service_dict.items():
port = state_service.payload["port"]
try:
label = self.get_label(ip, port=port)
product_dict = self.get_product_info(ip, port=port)
except packet.NoResponsesError as e:
logging.error(e)
logger.error(e)
continue

product_name = product_dict["name"]
Expand Down
11 changes: 7 additions & 4 deletions ledfx/libraries/lifxdev/messages/packet.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import collections
import dataclasses
import enum
import logging
import os
import re
import selectors
Expand All @@ -15,10 +14,14 @@
from collections.abc import Callable
from typing import Any, cast

from ledfx.libraries.lifxdev import get_library_logger

BUFFER_SIZE = 65535
LIFX_PORT = 56700
TIMEOUT_S = 1

logger = get_library_logger()


class NoResponsesError(Exception):
pass
Expand Down Expand Up @@ -677,7 +680,7 @@ def __init__(
"""
self._comm = comm
self._comm.comm.setblocking(False)
self._log_func = logging.info if verbose else logging.debug
self._log_func = logger.info if verbose else logger.debug
self._timeout = timeout

@property
Expand Down Expand Up @@ -900,7 +903,7 @@ def send(
Returns:
Source identifier of the packet for responses
"""
log_func = logging.info if verbose else self._log_func
log_func = logger.info if verbose else self._log_func
addr = (ip or self._comm.ip, port or self._comm.port)
comm = comm or self._comm.comm
kwargs["mac_addr"] = mac_addr or self._comm.mac_addr
Expand All @@ -920,7 +923,7 @@ def recv(
verbose: bool = False,
**kwargs,
) -> list[LifxResponse]:
log_func = logging.info if verbose else self._log_func
log_func = logger.info if verbose else self._log_func
comm = comm or self._comm.comm
payload_name = kwargs["payload"].name

Expand Down
Loading