Skip to content

Home Information - Your home, your data, organized.

Python

Moved locking outside "try" blocks.

Anthony Cassandra7fbf66b7a4b1
diff --git a/src/hi/apps/alert/alert_queue.py b/src/hi/apps/alert/alert_queue.py
index 003d06de..62a2c3c8 100644
--- a/src/hi/apps/alert/alert_queue.py
+++ b/src/hi/apps/alert/alert_queue.py
@@ -46,9 +46,8 @@ class AlertQueue:
returned. Returns None if there are no active alerts in the
specified time frame.
"""
+ self._active_alerts_lock.acquire()
try:
- self._active_alerts_lock.acquire()
-
if len(self._alert_list) < 1:
return None
@@ -77,9 +76,8 @@ class AlertQueue:
was to find a URL to switch to when automatically changing displays
based on alarms.
"""
+ self._active_alerts_lock.acquire()
try:
- self._active_alerts_lock.acquire()
-
if len(self._alert_list) < 1:
return None
@@ -110,8 +108,8 @@ class AlertQueue:
def add_alarm( self, alarm : Alarm ) -> Alert:
if alarm.alarm_level == AlarmLevel.NONE:
raise ValueError( f'Alarm not alert-worthy: {alarm}' )
+ self._active_alerts_lock.acquire()
try:
- self._active_alerts_lock.acquire()
for alert in self._alert_list:
if not alert.is_matching_alarm( alarm = alarm ):
continue
@@ -131,9 +129,8 @@ class AlertQueue:
return
def acknowledge_alert( self, alert_id : str ):
+ self._active_alerts_lock.acquire()
try:
- self._active_alerts_lock.acquire()
-
for alert in self._alert_list:
if alert.id != alert_id:
continue
@@ -146,9 +143,8 @@ class AlertQueue:
self._active_alerts_lock.release()
def remove_expired_or_acknowledged_alerts(self):
+ self._active_alerts_lock.acquire()
try:
- self._active_alerts_lock.acquire()
-
logger.debug( f'Alert Check: List size = {len(self._alert_list)}')
if len( self._alert_list ) < 1:
return
diff --git a/src/hi/apps/notify/notification_queue.py b/src/hi/apps/notify/notification_queue.py
index a5895266..71193474 100644
--- a/src/hi/apps/notify/notification_queue.py
+++ b/src/hi/apps/notify/notification_queue.py
@@ -19,9 +19,8 @@ class NotificationQueue:
def add_item( self, notification_item : NotificationItem ):
logger.debug( f'Adding notification to queue: {notification_item}' )
+ self._queues_lock.acquire()
try:
- self._queues_lock.acquire()
-
if notification_item.signature not in self._queues_map:
now_datetime = datetimeproxy.now()
self._queues_map[notification_item.signature] = ExponentialBackoffRateLimitedQueue(
@@ -39,9 +38,8 @@ class NotificationQueue:
def check_for_notifications( self ) -> List[ Notification ]:
notifications_map = dict()
+ self._queues_lock.acquire()
try:
- self._queues_lock.acquire()
-
now = datetimeproxy.now()
for signature, queue in self._queues_map.items():
logger.debug( f'Notify queue "{signature}" contains {len(queue)} items.' )
diff --git a/src/hi/apps/security/security_manager.py b/src/hi/apps/security/security_manager.py
index 5d358a6e..958b6d64 100644
--- a/src/hi/apps/security/security_manager.py
+++ b/src/hi/apps/security/security_manager.py
@@ -1,4 +1,3 @@
-from asgiref.sync import sync_to_async
import logging
from threading import Timer, Lock
from typing import Dict
@@ -63,8 +62,8 @@ class SecurityManager(Singleton):
return self._security_level
def get_security_status_data(self) -> SecurityStatusData:
+ self._security_status_lock.acquire()
try:
- self._security_status_lock.acquire()
current_security_state_label = self._security_state.label
if self._delayed_security_state:
if self._delayed_security_state == SecurityState.AWAY:
@@ -143,9 +142,8 @@ class SecurityManager(Singleton):
immediate_security_state : SecurityState,
future_security_state : SecurityState,
delay_secs : int ):
+ self._security_status_lock.acquire()
try:
- self._security_status_lock.acquire()
-
self.update_security_state_immediate(
new_security_state = immediate_security_state,
lock_acquired = True,
@@ -164,10 +162,9 @@ class SecurityManager(Singleton):
target_security_state : SecurityState,
delay_secs : int,
lock_acquired : bool = False ):
+ if not lock_acquired:
+ self._security_status_lock.acquire()
try:
- if not lock_acquired:
- self._security_status_lock.acquire()
-
self._delayed_security_state = target_security_state
if self._delayed_security_state_timer:
self._delayed_security_state_timer.cancel()
@@ -194,9 +191,8 @@ class SecurityManager(Singleton):
def update_security_state_auto( self, new_security_state : SecurityState ):
"""Special updating when coming from automation since extra handling is
needed if state is in a delayed transition (via SET_AWAY or SNOOZE)."""
+ self._security_status_lock.acquire()
try:
- self._security_status_lock.acquire()
-
if not self._security_state.auto_change_allowed:
logger.warning( f'Security state auto update but state={self._security_state}' )
return
@@ -232,10 +228,9 @@ class SecurityManager(Singleton):
def update_security_state_immediate( self,
new_security_state : SecurityState,
lock_acquired : bool = False ):
+ if not lock_acquired:
+ self._security_status_lock.acquire()
try:
- if not lock_acquired:
- self._security_status_lock.acquire()
-
self._cancel_security_state_transition()
if new_security_state == SecurityState.DISABLED:
diff --git a/src/hi/integrations/core/integration_manager.py b/src/hi/integrations/core/integration_manager.py
index f3df7881..7aa720c9 100644
--- a/src/hi/integrations/core/integration_manager.py
+++ b/src/hi/integrations/core/integration_manager.py
@@ -2,6 +2,7 @@ from asgiref.sync import sync_to_async
import asyncio
import json
import logging
+from threading import Lock
from typing import Dict, List
from django.apps import apps
@@ -27,6 +28,7 @@ class IntegrationManager( Singleton ):
def __init_singleton__( self ):
self._integration_data_map : Dict[ str, IntegrationData ] = dict()
self._monitor_map = {} # Known monitors
+ self._data_lock = Lock()
self._event_loop = None # Added dynamically and indicates if thread/event loop initialized
return
@@ -58,8 +60,12 @@ class IntegrationManager( Singleton ):
raise KeyError( f'Unknown integration id "{integration_id}".' )
async def initialize(self) -> None:
- await self._load_integration_data()
- await self._start_all_integration_monitors()
+ self._security_status_lock.acquire()
+ try:
+ await self._load_integration_data()
+ await self._start_all_integration_monitors()
+ finally:
+ self._data_lock.release()
return
async def _load_integration_data(self) -> None:
@@ -208,29 +214,32 @@ class IntegrationManager( Singleton ):
new attributes might have been defined. This allows new code
features to be added for existing installations.
"""
+ self._security_status_lock.acquire()
+ try:
+ new_attribute_types = set()
+ existing_attribute_integration_keys = set([ x.integration_key
+ for x in integration.attributes.all() ])
- new_attribute_types = set()
- existing_attribute_integration_keys = set([ x.integration_key
- for x in integration.attributes.all() ])
-
- AttributeType = integration_metadata.attribute_type
- for attribute_type in AttributeType:
- integration_key = IntegrationKey(
- integration_id = integration.integration_id,
- integration_name = str(attribute_type),
- )
- if integration_key not in existing_attribute_integration_keys:
- new_attribute_types.add( attribute_type )
- continue
-
- if new_attribute_types:
- with transaction.atomic():
- for attribute_type in new_attribute_types:
- self._create_integration_attribute(
- integration = integration,
- attribute_type = attribute_type,
- )
- continue
+ AttributeType = integration_metadata.attribute_type
+ for attribute_type in AttributeType:
+ integration_key = IntegrationKey(
+ integration_id = integration.integration_id,
+ integration_name = str(attribute_type),
+ )
+ if integration_key not in existing_attribute_integration_keys:
+ new_attribute_types.add( attribute_type )
+ continue
+
+ if new_attribute_types:
+ with transaction.atomic():
+ for attribute_type in new_attribute_types:
+ self._create_integration_attribute(
+ integration = integration,
+ attribute_type = attribute_type,
+ )
+ continue
+ finally:
+ self._data_lock.release()
return
def _create_integration_attribute( self,
@@ -256,18 +265,25 @@ class IntegrationManager( Singleton ):
def enable_integration( self,
integration_data : IntegrationData,
integration_attribute_formset : IntegrationAttributeFormSet ):
- with transaction.atomic():
- integration_data.integration.is_enabled = True
- integration_data.integration.save()
- integration_attribute_formset.save()
- self._start_integration_monitor( integration_data = integration_data )
+ self._security_status_lock.acquire()
+ try:
+ with transaction.atomic():
+ integration_data.integration.is_enabled = True
+ integration_data.integration.save()
+ integration_attribute_formset.save()
+ self._start_integration_monitor( integration_data = integration_data )
+ finally:
+ self._data_lock.release()
return
def disable_integration( self, integration_data : IntegrationData ):
-
- with transaction.atomic():
- integration_data.integration.is_enabled = False
- integration_data.integration.save()
- self._stop_integration_monitor( integration_data = integration_data )
+ self._security_status_lock.acquire()
+ try:
+ with transaction.atomic():
+ integration_data.integration.is_enabled = False
+ integration_data.integration.save()
+ self._stop_integration_monitor( integration_data = integration_data )
+ finally:
+ self._data_lock.release()
return
diff --git a/src/hi/integrations/core/views.py b/src/hi/integrations/core/views.py
index 85991d8a..32a93ef3 100644
--- a/src/hi/integrations/core/views.py
+++ b/src/hi/integrations/core/views.py
@@ -1,7 +1,6 @@
import logging
from django.core.exceptions import BadRequest
-from django.db import transaction
from django.urls import reverse
from hi.apps.config.enums import ConfigPageType