firewall: fix missing str() in host2vlan()

circle/firewall/fw.py

@@ -37,9 +37,9 @@ class Firewall:
             return
             return
 
 
         if self.proto == 6 and host.ipv6:
         if self.proto == 6 and host.ipv6:
-            ipaddr = host.ipv6 + '/112'
+            ipaddr = str(host.ipv6) + '/112'
         else:
         else:
-            ipaddr = host.ipv4
+            ipaddr = str(host.ipv4)
 
 
         dport_sport = self.dportsport(rule)
         dport_sport = self.dportsport(rule)
 
 

circle/firewall/tasks/local_tasks.py

@@ -47,10 +47,10 @@ def reloadtask(type='Host'):
         if type in ["Host", "Record", "Domain", "Vlan"]:
         if type in ["Host", "Record", "Domain", "Vlan"]:
             cache.add("dns_lock", "true", 30)
             cache.add("dns_lock", "true", 30)
 
 
-        if type == "Host":
+        if type in ["Host", "Vlan"]:
             cache.add("dhcp_lock", "true", 30)
             cache.add("dhcp_lock", "true", 30)
 
 
-        if type in ["Host", "Rule", "Firewall"]:
+        if type in ["Host", "Rule", "Firewall", "Vlan"]:
             cache.add("firewall_lock", "true", 30)
             cache.add("firewall_lock", "true", 30)
 
 
         if type == "Blacklist":
         if type == "Blacklist":