#74 Don't fail when rule throws exception

This commit is contained in:
nvbn
2015-04-21 14:40:52 +02:00
parent d5b4bddc4c
commit 888756d519
2 changed files with 25 additions and 16 deletions
+10 -4
View File
@@ -5,11 +5,12 @@ from os.path import expanduser
from subprocess import Popen, PIPE
import os
import sys
from traceback import format_exception
from psutil import Process, TimeoutExpired
Command = namedtuple('Command', ('script', 'stdout', 'stderr'))
Rule = namedtuple('Rule', ('match', 'get_new_command'))
Rule = namedtuple('Rule', ('name', 'match', 'get_new_command'))
def setup_user_dir():
@@ -43,7 +44,8 @@ def is_rule_enabled(settings, rule):
def load_rule(rule):
"""Imports rule module and returns it."""
rule_module = load_source(rule.name[:-3], str(rule))
return Rule(rule_module.match, rule_module.get_new_command)
return Rule(rule.name[:-3], rule_module.match,
rule_module.get_new_command)
def get_rules(user_dir, settings):
@@ -94,8 +96,12 @@ def get_command(settings, args):
def get_matched_rule(command, rules, settings):
"""Returns first matched rule for command."""
for rule in rules:
if rule.match(command, settings):
return rule
try:
if rule.match(command, settings):
return rule
except Exception:
sys.stderr.write(u'[WARN] {}: {}---------------------\n\n'.format(
rule.name, ''.join(format_exception(*sys.exc_info()))))
def confirm(new_command, settings):