code refactoring

This commit is contained in:
Bernardo Damele 2012-07-11 17:44:23 +01:00
parent 77b275f1a6
commit 02ec25b4b8

View File

@ -695,45 +695,30 @@ def singleTimeLogMessage(message, level=logging.INFO, flag=None):
logger.log(level, message) logger.log(level, message)
def setCurrentMessage(message): def setCurrentMessage(message):
if "[CRITICAL]" in message: logMsg = re.search("(CRITICAL|ERROR|WARNING|INFO|DEBUG|PAYLOAD|TRAFFIC OUT|TRAFFIC IN)", message)
kb.currentMessage = "CRITICAL"
elif "[ERROR]" in message: if logMsg:
kb.currentMessage = "ERROR" kb.currentMessage = logMsg.group(0)
elif "[WARNING]" in message:
kb.currentMessage = "WARNING"
elif "[INFO]" in message:
kb.currentMessage = "INFO"
elif "[DEBUG]" in message:
kb.currentMessage = "DEBUG"
elif "[PAYLOAD]" in message:
kb.currentMessage = "PAYLOAD"
elif "[TRAFFIC OUT]" in message:
kb.currentMessage = "TRAFFIC OUT"
elif "[TRAFFIC IN]" in message:
kb.currentMessage = "TRAFFIC IN"
def setColour(message): def setColour(message):
setCurrentMessage(message)
if not hasattr(kb, "currentMessage"): if not hasattr(kb, "currentMessage"):
return message return message
if kb.currentMessage == "CRITICAL": setCurrentMessage(message)
return colored(message, 'white', on_color='on_red', attrs=['bold'])
elif kb.currentMessage == "ERROR": color_map = {
return colored(message, 'red', attrs=['bold']) "CRITICAL": "white",
elif kb.currentMessage == "WARNING": "ERROR": "red",
return colored(message, 'yellow') "WARNING": "yellow",
elif kb.currentMessage == "INFO": "INFO": "green",
return colored(message, 'green') "DEBUG": "blue",
elif kb.currentMessage == "DEBUG": "PAYLOAD": "magenta",
return colored(message, 'blue') "TRAFFIC OUT": "cyan",
elif kb.currentMessage == "PAYLOAD": "TRAFFIC IN": "grey"
return colored(message, 'magenta') }
elif kb.currentMessage == "TRAFFIC OUT":
return colored(message, 'cyan') if kb.currentMessage:
elif kb.currentMessage == "TRAFFIC IN": return colored(message, color_map[kb.currentMessage], on_color='on_red' if kb.currentMessage == "CRITICAL" else None, attrs=['bold'] if kb.currentMessage == "CRITICAL" else None)
return colored(message, 'grey')
else: else:
return message return message