[trigger] Going back to simplified version
This commit is contained in:
parent
8068f057e0
commit
091a2d161e
6 changed files with 287 additions and 292 deletions
|
@ -20,12 +20,12 @@ import pika
|
|||
import gestion.secrets_new as secrets
|
||||
import gestion.config.trigger as trigger_config
|
||||
import gestion.affichage as affichage
|
||||
from gestion.trigger.host import trigger
|
||||
from gestion.trigger.host import trigger_service
|
||||
import cranslib.clogger as clogger
|
||||
import cmb
|
||||
|
||||
hostname = socket.gethostname().split(".")[0]
|
||||
logger = clogger.CLogger("trigger", "trigger", "info", trigger_config.debug)
|
||||
logger = clogger.CLogger("trigger", "trigger", trigger_config.log_level, trigger_config.debug)
|
||||
|
||||
# Ce bloc contient le peu de "magie" de la librairie, on utilise les services listés dans config/trigger.py
|
||||
# comme référence. Pour éviter toute redondance, la commande importe donc les services utiles suivant cette
|
||||
|
@ -70,7 +70,7 @@ class EvenementListener(cmb.AsynchronousConsumer):
|
|||
# about contient le nom de la fonction à appeler, body lui est filé en argument.
|
||||
try:
|
||||
if about in trigger_config.services[hostname]:
|
||||
trigger(about).regen(body)
|
||||
trigger_service(about)(body)
|
||||
else:
|
||||
raise AttributeError
|
||||
except AttributeError:
|
||||
|
@ -122,7 +122,7 @@ if __name__ == '__main__':
|
|||
for host_service in trigger_config.services[hostname]:
|
||||
try:
|
||||
print affichage.style(" (Ré)Génération du service %s" % (host_service,), "cyan")
|
||||
trigger(host_service).regen(True)
|
||||
trigger_service(host_service)(True)
|
||||
except AttributeError:
|
||||
print "No suitable trigger handle found for service %s on host %s" % (host_service, hostname)
|
||||
elif args.daemon:
|
||||
|
@ -133,4 +133,4 @@ if __name__ == '__main__':
|
|||
for arg_service in trigger_config.services[hostname]:
|
||||
if getattr(args, arg_service, False) == True:
|
||||
print affichage.style(" (Ré)Génération du service %s" % (arg_service,), "cyan")
|
||||
trigger(arg_service).regen(True)
|
||||
trigger_service(arg_service)(True)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue