Move distribution guessing into own function

This commit is contained in:
Carsten Grohmann 2018-11-08 20:53:52 +01:00
parent b7ca1fdec5
commit dd75da31c0

View File

@ -483,21 +483,7 @@ class OOMAnalyser(object):
else: else:
self.results['platform'] = 'unknown' self.results['platform'] = 'unknown'
# guess distribution from kernel version self.results['dist'] = self.guess_distribution(kernel_version)
if '.el7uek' in kernel_version:
self.results['dist'] = 'Oracle Linux 7 (Unbreakable Enterprise Kernel)'
elif '.el7' in kernel_version:
self.results['dist'] = 'RHEL 7/CentOS 7'
elif '.el6' in kernel_version:
self.results['dist'] = 'RHEL 6/CentOS 6'
elif '.el5' in kernel_version:
self.results['dist'] = 'RHEL 5/CentOS 5'
elif 'ARCH' in kernel_version:
self.results['dist'] = 'Arch Linux'
elif '_generic' in kernel_version:
self.results['dist'] = 'Ubuntu'
else:
self.results['dist'] = 'unknown'
# educated guess # educated guess
self.results['page_size'] = 4 self.results['page_size'] = 4
@ -527,6 +513,23 @@ class OOMAnalyser(object):
# already fully processed and no own element to display -> delete otherwise an error msg will be shown # already fully processed and no own element to display -> delete otherwise an error msg will be shown
del self.results['trigger_proc_gfp_flags'] del self.results['trigger_proc_gfp_flags']
def guess_distribution(self, kernel_version):
"""Guess distribution from kernel version"""
dist = 'unknown'
if '.el7uek' in kernel_version:
dist = 'Oracle Linux 7 (Unbreakable Enterprise Kernel)'
elif '.el7' in kernel_version:
dist = 'RHEL 7/CentOS 7'
elif '.el6' in kernel_version:
dist = 'RHEL 6/CentOS 6'
elif '.el5' in kernel_version:
dist = 'RHEL 5/CentOS 5'
elif 'ARCH' in kernel_version:
dist = 'Arch Linux'
elif '_generic' in kernel_version:
dist = 'Ubuntu'
return dist
def analyse(self): def analyse(self):
"""Return the analysis of the given OOM object""" """Return the analysis of the given OOM object"""
self._extract_from_oom_text() self._extract_from_oom_text()