Commit dc2a3c46 by Czémán Arnold

cloud: firewall: make synchronous reload_firewall_sync command

parent acb2f78f
# 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 <>.
from __future__ import unicode_literals, absolute_import
from import BaseCommand
from firewall.tasks.local_tasks import reloadtask
class Command(BaseCommand):
def handle(self, *args, **options):
......@@ -60,7 +60,7 @@ def get_firewall_queues():
return list(retval)
def reloadtask_worker():
from firewall.fw import BuildFirewall, dhcp, dns, ipset, vlan
from remote_tasks import (reload_dns, reload_dhcp, reload_firewall,
......@@ -92,7 +92,7 @@ def reloadtask_worker():
def reloadtask(type='Host', timeout=15):
def reloadtask(type='Host', timeout=15, sync=False):
reload = {
'Host': ['dns', 'dhcp', 'firewall'],
'Record': ['dns'],
......@@ -107,4 +107,6 @@ def reloadtask(type='Host', timeout=15):"Reload %s on next periodic iteration applying change to %s.",
", ".join(reload), type)
if all([cache.add("%s_lock" % i, 'true', 30) for i in reload]):
reloadtask_worker.apply_async(queue='', countdown=5)
res=reloadtask_worker.apply_async((sync,),queue='', countdown=5)
if sync:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment