From 51958b209353443493b631e41510f1ff49c75470 Mon Sep 17 00:00:00 2001 From: Jiyeong Seok Date: Thu, 16 Feb 2023 18:42:04 +0900 Subject: [PATCH] Add the package name to log and result file Signed-off-by: Jiyeong Seok --- src/fosslight_source/convert_scancode.py | 4 ++-- src/fosslight_source/run_scancode.py | 4 ++-- src/fosslight_source/run_scanoss.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/fosslight_source/convert_scancode.py b/src/fosslight_source/convert_scancode.py index fdba3c9..af1132d 100755 --- a/src/fosslight_source/convert_scancode.py +++ b/src/fosslight_source/convert_scancode.py @@ -43,11 +43,11 @@ def convert_json_to_output_report(scancode_json, output_file_name, need_license= if output_extension == _json_ext: output_file = "fosslight_opossum_" + start_time else: - output_file = "fosslight_report_" + start_time + output_file = "fosslight_report_src_" + start_time else: output_path = os.getcwd() - logger, result_log = init_log(os.path.join(output_path, "fosslight_log_" + start_time + ".txt"), + logger, result_log = init_log(os.path.join(output_path, "fosslight_log_src_" + start_time + ".txt"), True, logging.INFO, logging.DEBUG, _PKG_NAME) if not success: logger.error("Fail to convert scancode: " + msg) diff --git a/src/fosslight_source/run_scancode.py b/src/fosslight_source/run_scancode.py index 9911be3..a2922b5 100755 --- a/src/fosslight_source/run_scancode.py +++ b/src/fosslight_source/run_scancode.py @@ -49,7 +49,7 @@ def run_scan(path_to_scan, output_file_name="", if output_extension == _json_ext: output_file = f"fosslight_opossum_{_start_time}" else: - output_file = f"fosslight_report_{_start_time}" + output_file = f"fosslight_report_src_{_start_time}" if _write_json_file: output_json_file = os.path.join(output_path, "scancode_raw_result.json") @@ -57,7 +57,7 @@ def run_scan(path_to_scan, output_file_name="", output_json_file = "" if not called_by_cli: - logger, _result_log = init_log(os.path.join(output_path, f"fosslight_log_{_start_time}.txt"), + logger, _result_log = init_log(os.path.join(output_path, f"fosslight_log_src_{_start_time}.txt"), True, logging.INFO, logging.DEBUG, _PKG_NAME, path_to_scan) num_cores = multiprocessing.cpu_count() - 1 if num_cores < 0 else num_cores diff --git a/src/fosslight_source/run_scanoss.py b/src/fosslight_source/run_scanoss.py index c98ca1e..e788df6 100755 --- a/src/fosslight_source/run_scanoss.py +++ b/src/fosslight_source/run_scanoss.py @@ -45,7 +45,7 @@ def run_scanoss_py(path_to_scan, output_file_name="", format="", called_by_cli=F if not called_by_cli: global logger _start_time = datetime.now().strftime('%y%m%d_%H%M') - logger, _result_log = init_log(os.path.join(output_path, f"fosslight_log_{_start_time}.txt"), + logger, _result_log = init_log(os.path.join(output_path, f"fosslight_log_src_{_start_time}.txt"), True, logging.INFO, logging.DEBUG, _PKG_NAME, path_to_scan) scanoss_file_list = []