firewall: celery periodic task added

cloud/settings.py

@@ -187,6 +187,7 @@ CELERY_ROUTES = {
     'firewall.tasks.reload_firewall_task': {'queue': 'firewall'},
     'firewall.tasks.reload_firewall_task': {'queue': 'firewall'},
     'firewall.tasks.reload_dhcp_task': {'queue': 'dhcp'},
     'firewall.tasks.reload_dhcp_task': {'queue': 'dhcp'},
     'firewall.tasks.reload_blacklist_task': {'queue': 'firewall'},
     'firewall.tasks.reload_blacklist_task': {'queue': 'firewall'},
+    'firewall.tasks.Periodic': {'queue': 'local'},
 }
 }
 
 
 store_settings = {
 store_settings = {

firewall/tasks.py

@@ -19,44 +19,47 @@ def reload_dhcp_task(data):
 def reload_blacklist_task(data):
 def reload_blacklist_task(data):
     pass
     pass
 
 
-class ReloadTask(Task):
-    def run(self, type='Host'):
+class Periodic(PeriodicTask):
+    run_every = timedelta(seconds=60)
 
 
-        sleep=False
+    def run(self, **kwargs):
 
 
-        if type in ["Host", "Records", "Domain", "Vlan"]:
-            lock = lambda: cache.add("dns_lock", "true", 9)
-            if lock():
-                if not sleep:
-                    sleep = True
-                    time.sleep(10)
+        if cache.get('dns_lock'):
+            cache.delete("dns_lock")
             reload_dns_task.delay(dns())
             reload_dns_task.delay(dns())
+            print "dns ujratoltese kesz"
 
 
-        if type == "Host":
-            lock = lambda: cache.add("dhcp_lock", "true", 9)
-            if lock():
-                if not sleep:
-                    sleep = True
-                    time.sleep(10)
+        if cache.get('dhcp_lock'):
+            cache.delete("dhcp_lock")
             reload_dhcp_task.delay(dhcp())
             reload_dhcp_task.delay(dhcp())
+            print "dhcp ujratoltese kesz"
 
 
-        if type in ["Host", "Rule", "Firewall"]:
-            lock = lambda: cache.add("firewall_lock", "true", 9)
-            if lock():
-                if not sleep:
-                    sleep = True
-                    time.sleep(10)
+        if cache.get('firewall_lock'):
+            cache.delete("firewall_lock")
             ipv4 = Firewall().get()
             ipv4 = Firewall().get()
             ipv6 = Firewall(True).get()
             ipv6 = Firewall(True).get()
             reload_firewall_task.delay(ipv4, ipv6)
             reload_firewall_task.delay(ipv4, ipv6)
+            print "firewall ujratoltese kesz"
 
 
-        if type == "Blacklist":
-            lock = lambda: cache.add("blacklist_lock", "true", 9)
-            if lock():
-                if not sleep:
-                    sleep = True
-                    time.sleep(10)
+        if cache.get('blacklist_lock'):
+            cache.delete("blacklist_lock")
             reload_blacklist_task.delay(list(ipset()))
             reload_blacklist_task.delay(list(ipset()))
+            print "blacklist ujratoltese kesz"
+
+class ReloadTask(Task):
+    def run(self, type='Host'):
+
+        if type in ["Host", "Records", "Domain", "Vlan"]:
+            cache.add("dns_lock", "true", 30)
+
+        if type == "Host":
+            cache.add("dhcp_lock", "true", 30)
+
+        if type in ["Host", "Rule", "Firewall"]:
+            cache.add("firewall_lock", "true", 30)
+
+        if type == "Blacklist":
+            cache.add("blacklist_lock", "true", 30)
 
 
         print type
         print type