x/timmy
Code Issues Proposed changes

Ignore empty include & exclude filters for logs + drop adm_interface error to warning

Browse Source
This commit is contained in:
f3flight 2016-08-01 12:04:21 +00:00
parent 2f8034e0f3
commit 4f3abc25b6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
timmy/nodes.py
View File

@ -317,9 +317,9 @@ class Node(object):
def logs_populate(self, timeout=5): def logs_populate(self, timeout=5):
def filter_by_re(item, string): def filter_by_re(item, string):
return (('include' not in item or return (('include' not in item or not item['include'] or
re.search(item['include'], string)) and re.search(item['include'], string)) and
('exclude' not in item or not ('exclude' not in item or not item['exclude'] or not
re.search(item['exclude'], string))) re.search(item['exclude'], string)))
for item in self.logs: for item in self.logs:
@ -790,7 +790,7 @@ class NodeManager(object):
('cat /sys/class/net/', node.ip)) ('cat /sys/class/net/', node.ip))
out, err, code = tools.launch_cmd(cmd, node.timeout) out, err, code = tools.launch_cmd(cmd, node.timeout)
if code != 0: if code != 0:
self.logger.error("can't get iface speed: error: %s" % err) self.logger.warning("can't get iface speed: error: %s" % err)
return defspeed return defspeed
try: try:
speed = int(out) speed = int(out)