crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[trigger] Amélioration de lisibilité dans les logs, et correctif mineur

Browse source 
* Ordre des imports dans le service firewall foireux
This commit is contained in:
Pierre-Elliott Bécue 2014-07-14 04:14:20 +02:00
parent ccaf431202
commit 56d73814db
4 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
gestion/trigger/services/dhcp.py
View file

@ -6,6 +6,11 @@
# #
# Author : Pierre-Elliott Bécue <becue@crans.org> # Author : Pierre-Elliott Bécue <becue@crans.org>
# Licence : GPLv3 # Licence : GPLv3
# Date : 14/07/2014
#
# TODO : Take care of each XXX or TODO think about updating
# gestion/config/dhcp when submitting for production, because
# of .test files.
import socket import socket
import os import os
@ -78,12 +83,18 @@ class Dhcp(BasicService):
if body and isinstance(body, dict): if body and isinstance(body, dict):
for (mac, ip, name) in body.get("add", []): for (mac, ip, name) in body.get("add", []):
cls.add_dhcp_host(mac, ip, name) logger.info("Updating DHCP db by adding %s, %s, %s", mac, ip, name)
# XXX - Uncommend this when we need to start prod
# cls.add_dhcp_host(mac, ip, name)
for (mac, ip) in body.get("delete", []): for (mac, ip) in body.get("delete", []):
cls.delete_dhcp_host(mac, ip) logger.info("Updating DHCP db by deleting %s, %s", mac, ip)
# XXX - Uncommend this when we need to start prod
# cls.delete_dhcp_host(mac, ip)
for (rmac, rip, mac, ip, name) in body.get("update", []): for (rmac, rip, mac, ip, name) in body.get("update", []):
cls.delete_dhcp_host(rmac, rip) logger.info("Updating DHCP db by modifying %s, %s to %s, %s, %s", rmac, rip, mac, ip, name)
cls.add_dhcp_host(mac, ip, name) # XXX - Uncommend this when we need to start prod
# cls.delete_dhcp_host(rmac, rip)
# cls.add_dhcp_host(mac, ip, name)
elif body == True: elif body == True:
hosts = {} hosts = {}
host_template = """ host_template = """

2
gestion/trigger/services/event.py
View file

@ -48,7 +48,7 @@ class EventProducer(cmb.BasicProducer):
"""Extended """Extended
""" """
logger.info("Starting trigger EventProducer program…") logger.info("Starting trigger EventProducer program for app %s…", app_id)
super(EventProducer, self).__init__(trigger_config.master, 'trigger', app_id) super(EventProducer, self).__init__(trigger_config.master, 'trigger', app_id)
self._connection = self.connect() self._connection = self.connect()
self.get_chan() self.get_chan()

2
gestion/trigger/services/firewall.py
View file

@ -15,11 +15,11 @@ it to regenerate what needs to.
""" """
import cranslib.clogger as clogger import cranslib.clogger as clogger
import gestion.config.trigger as trigger_config
logger = clogger.CLogger("trigger", "firewall", "debug", trigger_config.debug) logger = clogger.CLogger("trigger", "firewall", "debug", trigger_config.debug)
import lc_ldap.shortcuts import lc_ldap.shortcuts
import gestion.config.trigger as trigger_config
from gestion.trigger.services.service import BasicService from gestion.trigger.services.service import BasicService
import gestion.trigger.firewall4.firewall4 as firewall4 import gestion.trigger.firewall4.firewall4 as firewall4

2
gestion/trigger/trigger.py
View file

@ -61,9 +61,9 @@ class EvenementListener(cmb.AsynchronousConsumer):
# Peut-être utile plus tard # Peut-être utile plus tard
#origin = properties.app_id #origin = properties.app_id
#message_id = properties.message_id #message_id = properties.message_id
body = cPickle.loads(body)
logger.info('Received message # %s from %s: %s', logger.info('Received message # %s from %s: %s',
basic_deliver.delivery_tag, properties.app_id, body) basic_deliver.delivery_tag, properties.app_id, body)
body = cPickle.loads(body)
# On tente d'invoquer le trigger attendu, à l'aide de la méthode trigger # On tente d'invoquer le trigger attendu, à l'aide de la méthode trigger
# about contient le nom de la fonction à appeler, body lui est filé en argument. # about contient le nom de la fonction à appeler, body lui est filé en argument.
try: try: