← Back to branch summary

~pjdc/charms/trusty/wsgi-app/add-nagios-context

« back to all changes in this revision

Viewing changes to hooks/hooks.py

  • Committer: Tristram Oaten
  • Date: 2014-12-03 15:56:56 UTC
  • Revision ID: tristram@oaten.name-20141203155656-9l0jsbe5igmekkbp
make hooks more sane

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/hooks.py
404
404
 
405
405
 
406
406
if __name__ == "__main__":
407
 
    hook_name = sys.argv[0].replace('hooks/', '')
408
 
 
409
 
    # Check for erroneous hooks
410
 
    if hook_name not in ansible_hooks._hooks.keys() + hooks._hooks.keys():
411
 
        raise UnregisteredHookError(hook_name)
 
407
    ansible_failed = False
412
408
 
413
409
    # Run ansible hooks first
414
 
    if hook_name in ansible_hooks._hooks.keys():
 
410
    try:
415
411
        ansible_hooks.execute(sys.argv)
416
 
    if hook_name in hooks._hooks.keys():
 
412
    except UnregisteredHookError:
 
413
        ansible_failed = True
 
414
 
 
415
    # Then try regular hooks
 
416
    try:
417
417
        hooks.execute(sys.argv)
 
418
    except UnregisteredHookError as hook_error:
 
419
        if ansible_failed:
 
420
            raise hook_error