From 204a53d4e56ddbcfbae96d7ffc9ddd0fbecc3854 Mon Sep 17 00:00:00 2001 From: Adam Shapiro Date: Mon, 9 Dec 2024 16:19:19 -0500 Subject: [PATCH 1/2] Fixed p1_capture --output-format option. --- python/fusion_engine_client/applications/p1_capture.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/fusion_engine_client/applications/p1_capture.py b/python/fusion_engine_client/applications/p1_capture.py index f9ff5c21..9f267bdc 100755 --- a/python/fusion_engine_client/applications/p1_capture.py +++ b/python/fusion_engine_client/applications/p1_capture.py @@ -142,7 +142,7 @@ def main(): # Open the output file if logging was requested. if options.output is not None: - if options.format == 'p1log': + if options.output_format == 'p1log': p1i_path = os.path.splitext(options.output)[0] + '.p1i' if os.path.exists(p1i_path): os.remove(p1i_path) @@ -151,9 +151,9 @@ def main(): else: output_file = None - generating_raw_log = (output_file is not None and options.format == 'raw') - generating_p1log = (output_file is not None and options.format == 'p1log') - generating_csv = (output_file is not None and options.format == 'csv') + generating_raw_log = (output_file is not None and options.output_format == 'raw') + generating_p1log = (output_file is not None and options.output_format == 'p1log') + generating_csv = (output_file is not None and options.output_format == 'csv') if generating_csv: output_file.write(b'host_time,type,p1_time,sys_time\n') From 29a4f381da7eff0b1011672289959fdb087ca99a Mon Sep 17 00:00:00 2001 From: Adam Shapiro Date: Tue, 10 Dec 2024 16:42:40 -0500 Subject: [PATCH 2/2] Output raw format by default, don't filter out any binary data. --- python/fusion_engine_client/applications/p1_capture.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/fusion_engine_client/applications/p1_capture.py b/python/fusion_engine_client/applications/p1_capture.py index 9f267bdc..f20cb69b 100755 --- a/python/fusion_engine_client/applications/p1_capture.py +++ b/python/fusion_engine_client/applications/p1_capture.py @@ -91,7 +91,7 @@ def main(): file_group = parser.add_argument_group('File Capture') file_group.add_argument( - '-f', '--output-format', default='p1log', choices=('p1log', 'raw', 'csv'), + '-f', '--output-format', default='raw', choices=('p1log', 'raw', 'csv'), help="""\ The format of the file to be generated when --output is enabled: - p1log - Create a *.p1log file containing only FusionEngine messages (default)