Skip to content

analyze/dump: refactor shared string into variable #350

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

Merged
blackboxsw merged 3 commits into from
May 12, 2020
Merged

analyze/dump: refactor shared string into variable #350

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
614f002
analyze/dump: refactor shared string into variable
OddBloke May 6, 2020
50b56ff
Merge branch 'master' into analyze
OddBloke May 8, 2020
328a3a0
Merge branch 'master' into analyze
blackboxsw May 11, 2020
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
5 changes: 3 additions & 2 deletions cloudinit/analyze/dump.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ def parse_ci_logline(line):
# Apr 30 19:39:11 cloud-init[2673]: handlers.py[DEBUG]: start: \
# init-local/check-cache: attempting to read from cache [check]

separators = [' - ', ' [CLOUDINIT] ', ' cloud-init[']
amazon_linux_2_sep = ' cloud-init['
separators = [' - ', ' [CLOUDINIT] ', amazon_linux_2_sep]
found = False
for sep in separators:
if sep in line:
Expand All @@ -101,7 +102,7 @@ def parse_ci_logline(line):
hostname = extra.split()[-1]
else:
hostname = timehost.split()[-1]
if sep == ' cloud-init[':
if sep == amazon_linux_2_sep:
# This is an Amazon Linux style line, with no hostname and a PID.
# Use the whole of timehost as timestampstr, and strip off the PID
# from the start of eventstr.
Expand Down