x/timmy
Code Issues Proposed changes

fix: soft filters for logs-part

Browse Source
This commit is contained in:
adobdin 2016-04-14 11:31:11 +00:00
parent e43fc66962
commit 05005ec476
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
timmy/cli.py
View File

@ -79,9 +79,10 @@ def main(argv=None):
main_arc,
60)
if args.only_logs or args.getlogs:
lock = flock.FLock('/tmp/timmy-logs.lock')
lf = '/tmp/timmy-logs.lock'
lock = flock.FLock(lf)
if not lock.lock():
logging.warning('Unable to obtain lock, skipping "logs"-part')
logging.warning('Unable to obtain lock %s, skipping "logs"-part' % lf)
return 1
n.get_node_file_list()
# n.set_template_for_find()

35
timmy/nodes.py
View File

@ -229,7 +229,6 @@ class Node(object):
if re.search(lfilter['exclude'], f):
rflogs.append(f)
logging.info('logs_exclude_filter: %s' % f)
#flogs[f.split("\t")[1]] = int(f.split("\t")[0])
except re.error as e:
logging.error('logs_include_filter: filter: %s, str: %s, re.error: %s' %
(lfilter, f, str(e)))
@ -462,23 +461,31 @@ class Nodes(object):
def filter_logs(self):
for node in self.nodes.values():
node.logs_filter(self.conf.log_files['filter']['default'])
for role in node.roles:
if ('by_role' in self.conf.log_files['filter'] and
role in self.conf.log_files['filter']['by_role'].keys()):
logging.info('filter_logs: node:%s apply role: %s' %
(node.node_id, role))
node.logs_filter(self.conf.log_files['filter']['by_role'][role])
logging.debug('filter logs: node-%s: filtered logs: %s' %
(node.node_id, node.flogs))
if (self.cluster and str(self.cluster) != str(node.cluster) and
node.cluster != 0):
continue
if node.status in self.conf.soft_filter.status and node.online:
node.logs_filter(self.conf.log_files['filter']['default'])
for role in node.roles:
if ('by_role' in self.conf.log_files['filter'] and
role in self.conf.log_files['filter']['by_role'].keys()):
logging.info('filter_logs: node:%s apply role: %s' %
(node.node_id, role))
node.logs_filter(self.conf.log_files['filter']['by_role'][role])
logging.debug('filter logs: node-%s: filtered logs: %s' %
(node.node_id, node.flogs))
def calculate_log_size(self, timeout=15):
lsize = 0
for node in self.nodes.values():
if not node.log_size_from_find(self.conf.log_files['path'],
self.sshopts,
5):
logging.warning("can't get log file list from node %s" % node.node_id)
if (self.cluster and str(self.cluster) != str(node.cluster) and
node.cluster != 0):
continue
if node.status in self.conf.soft_filter.status and node.online:
if not node.log_size_from_find(self.conf.log_files['path'],
self.sshopts,
5):
logging.warning("can't get log file list from node %s" % node.node_id)
self.filter_logs()
for node in self.nodes.values():
for f in node.flogs: