parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Improve output formatting of node logs

This commit is contained in:
Joshua Boniface 2021-07-18 20:06:08 -04:00
parent b770e15a91
commit ba257048ad
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
client-cli/pvc/cli_lib/node.py
View File

@ -120,6 +120,7 @@ def follow_node_log(config, node, lines=10):
# Print the initial data and begin following # Print the initial data and begin following
print(loglines, end='') print(loglines, end='')
print('\n', end='')
while True: while True:
# Grab the next line set (500 is a reasonable number of lines per second; any more are skipped) # Grab the next line set (500 is a reasonable number of lines per second; any more are skipped)
@ -134,24 +135,22 @@ def follow_node_log(config, node, lines=10):
# Split the new and old log strings into constitutent lines # Split the new and old log strings into constitutent lines
old_node_loglines = node_log.split('\n') old_node_loglines = node_log.split('\n')
new_node_loglines = new_node_log.split('\n') new_node_loglines = new_node_log.split('\n')
# Set the node log to the new log value for the next iteration # Set the node log to the new log value for the next iteration
node_log = new_node_log node_log = new_node_log
# Remove the lines from the old log until we hit the first line of the new log; this
# ensures that the old log is a string that we can remove from the new log entirely # Get the set difference between the two sets of lines
for index, line in enumerate(old_node_loglines, start=0): # We can safely use sets here since, due to the timestamps, we can guarantee that every
if line == new_node_loglines[0]: # individual log line is distinct, and similarly we can re-sort the diff afterwards.
del old_node_loglines[0:index] diff_node_loglines = sorted(list(set(new_node_loglines) - set(old_node_loglines)))
break
# Rejoin the log lines into strings
old_node_log = '\n'.join(old_node_loglines)
new_node_log = '\n'.join(new_node_loglines)
# Remove the old lines from the new log
diff_node_log = new_node_log.replace(old_node_log, "")
# If there's a difference, print it out # If there's a difference, print it out
if diff_node_log: if len(diff_node_loglines) > 0:
print(diff_node_log, end='') print('\n'.join(diff_node_loglines), end='')
# Wait a second print('\n', end='')
time.sleep(1)
# Wait half a second
time.sleep(0.5)
return True, '' return True, ''