Skip to content

Commit e77e6d3

Browse files
committed
Fix review feedback issues
- Added missing model definition that was causing AttributeError - Fixed line length for black formatting - Actually implemented the VPN cache invalidation logic - Moved import out of loop Should fix the CI failures now.
1 parent 30475e5 commit e77e6d3

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

openwisp_controller/config/apps.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ def __setmodels__(self):
6161
self.org_limits = load_model("config", "OrganizationLimits")
6262
self.cert_model = load_model("django_x509", "Cert")
6363
self.org_model = load_model("openwisp_users", "Organization")
64+
self.organization_config_settings_model = load_model(
65+
"config", "OrganizationConfigSettings"
66+
)
6467

6568
def connect_signals(self):
6669
"""

openwisp_controller/config/handlers.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,14 @@ def organization_config_settings_change_handler(instance, **kwargs):
161161
if instance._state.adding:
162162
return
163163

164+
# Check if context actually changed
164165
try:
165166
db_instance = instance.__class__.objects.only("context").get(id=instance.id)
166167
if db_instance.context != instance.context:
167168
transaction.on_commit(
168-
lambda: tasks.invalidate_organization_vpn_cache.delay(str(instance.organization_id))
169+
lambda: tasks.invalidate_organization_vpn_cache.delay(
170+
str(instance.organization_id)
171+
)
169172
)
170173
except instance.__class__.DoesNotExist:
171174
pass

openwisp_controller/config/tasks.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,9 @@ def invalidate_organization_vpn_cache(organization_id):
107107
organization configuration variables change.
108108
"""
109109
Vpn = load_model("config", "Vpn")
110-
110+
from .controller.views import GetVpnView
111+
111112
for vpn in Vpn.objects.filter(organization_id=organization_id).iterator():
112-
from .controller.views import GetVpnView
113-
114113
GetVpnView.invalidate_get_vpn_cache(vpn)
115114
vpn.invalidate_checksum_cache()
116115

0 commit comments

Comments
 (0)