Skip to content

fix error handling output for userscripts collector #536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
keen99 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix error handling output for userscripts collector #536

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ccc431
fix error handling output for userscripts collector
keen99 Sep 22, 2016
74dacb5
update userscripts log message for no stdout
keen99 Sep 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/collectors/userscripts/userscripts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ def collect(self):
(absolutescriptpath, e))
continue
if proc.returncode:
self.log.error("%s return exit value %s; skipping" %
self.log.error("%s return exit value %s" %
(absolutescriptpath, proc.returncode))
if not out:
self.log.info("%s return no output" % absolutescriptpath)
continue
if err:
self.log.error("%s return error output: %s" %
self.log.warning("%s return error output: %s" %
(absolutescriptpath, err))
if not out:
self.log.error("%s returned no output; skipping" % absolutescriptpath)
continue
# Use filter to remove empty lines of output
for line in filter(None, out.split('\n')):
# Ignore invalid lines
Expand Down