未验证 提交 39069684 编写于 作者: C Cleber Rosa

Merge remote-tracking branch 'apahim/sysinfo_fails_silently_v2'

...@@ -335,15 +335,24 @@ class SysInfo(object): ...@@ -335,15 +335,24 @@ class SysInfo(object):
'commands', 'commands',
key_type='path', key_type='path',
default='') default='')
log.info('Commands configured by file: %s', commands_file)
self.commands = genio.read_all_lines(commands_file) if os.path.isfile(commands_file):
log.info('Commands configured by file: %s', commands_file)
self.commands = genio.read_all_lines(commands_file)
else:
log.debug('File %s does not exist.', commands_file)
self.commands = []
files_file = settings.get_value('sysinfo.collectibles', files_file = settings.get_value('sysinfo.collectibles',
'files', 'files',
key_type='path', key_type='path',
default='') default='')
log.info('Files configured by file: %s', files_file) if os.path.isfile(files_file):
self.files = genio.read_all_lines(files_file) log.info('Files configured by file: %s', files_file)
self.files = genio.read_all_lines(files_file)
else:
log.debug('File %s does not exist.', files_file)
self.files = []
if profiler is None: if profiler is None:
self.profiler = settings.get_value('sysinfo.collect', self.profiler = settings.get_value('sysinfo.collect',
...@@ -357,18 +366,20 @@ class SysInfo(object): ...@@ -357,18 +366,20 @@ class SysInfo(object):
'profilers', 'profilers',
key_type='path', key_type='path',
default='') default='')
self.profilers = genio.read_all_lines(profiler_file) if os.path.isfile(profiler_file):
self.profilers = genio.read_all_lines(profiler_file)
log.info('Profilers configured by file: %s', profiler_file) log.info('Profilers configured by file: %s', profiler_file)
log.info('Profilers declared: %s', self.profilers)
if not self.profilers:
self.profiler = False
if self.profiler is False:
if not self.profilers: if not self.profilers:
log.info('Profiler disabled: no profiler commands configured') self.profiler = False
else:
log.info('Profiler disabled') if self.profiler is False:
if not self.profilers:
log.info('Profiler disabled: no profiler commands configured')
else:
log.info('Profiler disabled')
else:
log.debug('File %s does not exist.', profiler_file)
self.profilers = []
self.start_job_collectibles = set() self.start_job_collectibles = set()
self.end_job_collectibles = set() self.end_job_collectibles = set()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册