Skip to content

Commit d8b41c7

Browse files
committed
Remove loggers, add missing awaits, avoid excessive cache-writing
1 parent 3b925b0 commit d8b41c7

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

plugwise_usb/nodes/circle.py

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -529,9 +529,6 @@ async def _get_initial_energy_logs(self) -> None:
529529
log_address, _ = calc_log_address(log_address, 1, -4)
530530
total_addresses -= 1
531531

532-
if self._cache_enabled:
533-
await self._energy_log_records_save_to_cache()
534-
535532
async def get_missing_energy_logs(self) -> None:
536533
"""Task to retrieve missing energy logs."""
537534
self._energy_counters.update()
@@ -565,9 +562,6 @@ async def get_missing_energy_logs(self) -> None:
565562
await gather(*to_cancel, return_exceptions=True)
566563
break
567564

568-
if self._cache_enabled:
569-
await self._energy_log_records_save_to_cache()
570-
571565
async def energy_log_update(
572566
self, address: int | None, save_cache: bool = True
573567
) -> bool:
@@ -713,8 +707,6 @@ async def _energy_log_records_save_to_cache(self) -> None:
713707
cached_logs = "|".join(records)
714708
_LOGGER.debug("Saving energy logrecords to cache for %s", self._mac_in_str)
715709
self._set_cache(CACHE_ENERGY_COLLECTION, cached_logs)
716-
# Persist new cache entries to disk immediately
717-
await self.save_cache(trigger_only=True)
718710

719711
async def _energy_log_record_update_state(
720712
self,
@@ -725,15 +717,9 @@ async def _energy_log_record_update_state(
725717
import_only: bool = False,
726718
) -> bool:
727719
"""Process new energy log record. Returns true if record is new or changed."""
728-
_LOGGER.warning(
729-
"EnergyLogs before update: %s", self._energy_counters.get_pulse_logs()
730-
)
731720
self._energy_counters.add_pulse_log(
732721
address, slot, timestamp, pulses, import_only=import_only
733722
)
734-
_LOGGER.warning(
735-
"EnergyLogs after update: %s", self._energy_counters.get_pulse_logs()
736-
)
737723
if not self._cache_enabled:
738724
return False
739725

@@ -749,8 +735,7 @@ async def _energy_log_record_update_state(
749735
str(slot),
750736
self._mac_in_str,
751737
)
752-
self._energy_log_records_save_to_cache()
753-
await self.save_cache(trigger_only=True)
738+
await self._energy_log_records_save_to_cache()
754739
return True
755740

756741
_LOGGER.debug(
@@ -764,8 +749,7 @@ async def _energy_log_record_update_state(
764749
str(slot),
765750
self._mac_in_str,
766751
)
767-
self._energy_log_records_save_to_cache()
768-
await self.save_cache(trigger_only=True)
752+
await self._energy_log_records_save_to_cache()
769753
return True
770754

771755
@raise_not_loaded

0 commit comments

Comments
 (0)