diff --git a/flowspec/models.py b/flowspec/models.py index 6199de9d4bd9cbc51c1769b3f417205e3d6352d9..907e5920f0f05e555fe4a88565c740b0b896f41e 100644 --- a/flowspec/models.py +++ b/flowspec/models.py @@ -44,7 +44,7 @@ from peers.models import PeerRange, Peer FORMAT = '%(asctime)s %(levelname)s: %(message)s' logging.basicConfig(format=FORMAT) logger = logging.getLogger(__name__) -logger.setLevel(logging.DEBUG) +logger.setLevel(logging.INFO) FRAGMENT_CODES = ( @@ -772,6 +772,7 @@ def send_message(msg, user): b.close() def send_message_multiple(msg, user_list): + logger.info("model::send_message_multiple(): user_list="+str(user_list)+" : "+str(msg)) for peer in user_list: b = beanstalkc.Connection() b.use(settings.POLLS_TUBE) diff --git a/flowspec/viewsets.py b/flowspec/viewsets.py index b55d7f1b263feb7e19d7211cc5829390295c0b30..6aa65a7b6e786d46a10c17f44b26bb14999a9f60 100644 --- a/flowspec/viewsets.py +++ b/flowspec/viewsets.py @@ -116,10 +116,11 @@ class RuleViewSet(viewsets.ModelViewSet): obj.applier = self.request.user def post_save(self, obj, created): - logger.info("RuleViewSet::post_save(): "+str(self)+", obj="+str(obj) + " " + str(created)) + logger.info("RuleViewSet::post_save(): "+str(self)+", obj="+str(obj) + " created=" + str(created)) if created and obj.editing == False: obj.commit_add() else: + logger.info("RuleViewSet::post_save(): "+str(self)+", obj="+str(obj) + " obj.status="+str(obj.status)+" obj.editing="+str(obj.editing)) if obj.status == "CREATED" and obj.editing == False: obj.status = "INACTIVE" obj.save() @@ -127,6 +128,8 @@ class RuleViewSet(viewsets.ModelViewSet): obj.commit_add() elif obj.status not in ['EXPIRED', 'INACTIVE', 'ADMININACTIVE'] and obj.editing == False: obj.commit_edit() + elif obj.status in ['INACTIVE'] and obj.editing == False: + obj.commit_edit() def pre_delete(self, obj): logger.info("RuleViewSet::pre_delete(): called "+str(self)+", obj="+str(obj))