Georg/OOMAnalyser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge handling of regular expressions using the same pattern

Browse Source
This commit is contained in:
Carsten Grohmann 2018-04-15 21:07:14 +02:00
parent 3e6d4c8662
commit 0b3beb07c6
1 changed files with 19 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
OOMAnalyser.py
View File

@ -609,13 +609,26 @@ Killed process 6576 (java) total-vm:33914892kB, anon-rss:20629004kB, file-rss:0k
def _extract_from_oom_text(self): def _extract_from_oom_text(self):
"""Extract details from OOM message text""" """Extract details from OOM message text"""
match = self.REC_INVOKED_OOMKILLER.search(self.oom.text)
if match:
self.details.update(match.groupdict())
match = self.REC_PID_KERNELVERSION.search(self.oom.text) for rec in [self.REC_INVOKED_OOMKILLER,
if match: self.REC_KILLED,
self.details.update(match.groupdict()) self.REC_MEMINFO_1,
self.REC_MEMINFO_2,
self.REC_PAGECACHE,
self.REC_PAGEINFO,
self.REC_PID_KERNELVERSION,
self.REC_SWAP,
]:
match = rec.search(self.oom.text)
if match:
self.details.update(match.groupdict())
for groupname, rec in [('mem_node_info', self.REC_MEM_NODEINFO),
('process_table', self.REC_PROCESSES),
]:
match = rec.search(self.oom.text)
if match:
self.details[groupname] = match.group()
self.details['hardware_info'] = self._extract_block_from_next_pos('Hardware name:') self.details['hardware_info'] = self._extract_block_from_next_pos('Hardware name:')
@ -628,38 +641,6 @@ Killed process 6576 (java) total-vm:33914892kB, anon-rss:20629004kB, file-rss:0k
call_trace += "{}\n".format(line.strip()) call_trace += "{}\n".format(line.strip())
self.details['call_trace'] = call_trace self.details['call_trace'] = call_trace
match = self.REC_MEMINFO_1.search(self.oom.text)
if match:
self.details.update(match.groupdict())
match = self.REC_MEMINFO_2.search(self.oom.text)
if match:
self.details.update(match.groupdict())
match = self.REC_MEM_NODEINFO.search(self.oom.text)
if match:
self.details['mem_node_info'] = match.group()
match = self.REC_PAGECACHE.search(self.oom.text)
if match:
self.details.update(match.groupdict())
match = self.REC_SWAP.search(self.oom.text)
if match:
self.details.update(match.groupdict())
match = self.REC_PAGEINFO.search(self.oom.text)
if match:
self.details.update(match.groupdict())
match = self.REC_PROCESSES.search(self.oom.text)
if match:
self.details['process_table'] = match.group()
match = self.REC_KILLED.search(self.oom.text)
if match:
self.details.update(match.groupdict())
def _calc_from_oom_details(self): def _calc_from_oom_details(self):
""" """
Calculate values from already extracted details Calculate values from already extracted details