cloud: firewall: make synchronous reload_firewall_sync command

circle/firewall/management/commands/reload_firewall_sync.py

+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals, absolute_import
+
+from django.core.management.base import BaseCommand
+
+from firewall.tasks.local_tasks import reloadtask
+
+
+class Command(BaseCommand):
+    def handle(self, *args, **options):
+        reloadtask('Vlan',sync=True)

circle/firewall/tasks/local_tasks.py

@@ -60,7 +60,7 @@ def get_firewall_queues():
     return list(retval)
     return list(retval)
 
 
 
 
-@celery.task(ignore_result=True)
+@celery.task
 def reloadtask_worker():
 def reloadtask_worker():
     from firewall.fw import BuildFirewall, dhcp, dns, ipset, vlan
     from firewall.fw import BuildFirewall, dhcp, dns, ipset, vlan
     from remote_tasks import (reload_dns, reload_dhcp, reload_firewall,
     from remote_tasks import (reload_dns, reload_dhcp, reload_firewall,
@@ -92,7 +92,7 @@ def reloadtask_worker():
 
 
 
 
 @celery.task
 @celery.task
-def reloadtask(type='Host', timeout=15):
+def reloadtask(type='Host', timeout=15, sync=False):
     reload = {
     reload = {
         'Host': ['dns', 'dhcp', 'firewall'],
         'Host': ['dns', 'dhcp', 'firewall'],
         'Record': ['dns'],
         'Record': ['dns'],
@@ -107,4 +107,6 @@ def reloadtask(type='Host', timeout=15):
     logger.info("Reload %s on next periodic iteration applying change to %s.",
     logger.info("Reload %s on next periodic iteration applying change to %s.",
                 ", ".join(reload), type)
                 ", ".join(reload), type)
     if all([cache.add("%s_lock" % i, 'true', 30) for i in reload]):
     if all([cache.add("%s_lock" % i, 'true', 30) for i in reload]):
-        reloadtask_worker.apply_async(queue='localhost.man', countdown=5)
+        res=reloadtask_worker.apply_async((sync,),queue='localhost.man', countdown=5)
+        if sync:
+            res.get(15)