Replace logger with fosslight_util

Author: soimkim

requirements.txt

@@ -1,4 +1,5 @@
 scancode-toolkit<=21.2.25
 typecode_libmagic
 XlsxWriter
-progress
+progress
+fosslight_util

src/fosslight_source/_parsing_scancode_file_item.py

@@ -5,8 +5,9 @@
 
 import os
 import logging
+import fosslight_util.constant as constant
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger(constant.LOGGER_NAME)
 _replace_word = ["-only", "-old-style", "-or-later", "licenseref-scancode-"]
 _exclude_filename = ["changelog", "config.guess", "config.sub",
                      "config.h.in", "changes", "ltmain.sh",

src/fosslight_source/_settings.py

@@ -7,6 +7,7 @@
 import csv
 import time
 import logging
+import fosslight_util.constant as constant
 
 _SRC_HEADER = ['ID', 'Source Name or Path', 'OSS Name',
                'OSS Version', 'License',  'Download Location',

src/fosslight_source/_write_oss_report_src.py

@@ -10,12 +10,13 @@
 import platform
 from datetime import datetime
 import logging
+import fosslight_util.constant as constant
+from fosslight_util.set_log import init_log
 
 from ._write_oss_report_src import write_result_to_csv, write_result_to_excel
 from ._parsing_scancode_file_item import parsing_file_item
-from ._settings import init_log
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger(constant.LOGGER_NAME)
 
 
 def convert_json_to_excel(scancode_json, excel_name, csv_name):
@@ -73,6 +74,8 @@ def print_help_msg():
 
 
 def main():
+    global logger
+
     argv = sys.argv[1:]
     path_to_find_bin = os.getcwd()
     start_time = datetime.now().strftime('%Y-%m-%d_%H-%M-%S')
@@ -99,7 +102,7 @@ def main():
         csv_file_name = output_file_name
         output_dir = os.path.dirname(os.path.abspath(output_file_name))
 
-    init_log(start_time, output_dir)
+    logger = init_log(os.path.join(output_dir, "fosslight_src_log_"+start_time+".txt"))
 
     convert_json_to_excel(path_to_find_bin,
                           oss_report_name + ".xlsx", csv_file_name + ".csv")

src/fosslight_source/convert_scancode.py

@@ -13,12 +13,13 @@
 
 from scancode import cli
 from datetime import datetime
+import fosslight_util.constant as constant
+from fosslight_util.set_log import init_log
 from ._write_oss_report_src import write_result_to_csv, write_result_to_excel
 from ._parsing_scancode_file_item import parsing_file_item
-from ._settings import init_log
 from ._timer_thread import TimerThread
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger(constant.LOGGER_NAME)
 warnings.filterwarnings("ignore", category=FutureWarning)
 
 
@@ -57,6 +58,7 @@ def main():
 
 def run_scan(path_to_scan, output_file_name="",
              _write_json_file=False, num_cores=-1):
+    global logger
 
     success = True
     msg = ""
@@ -75,7 +77,7 @@ def run_scan(path_to_scan, output_file_name="",
         output_json_file = output_file_name
         output_dir = os.path.dirname(os.path.abspath(output_file_name))
 
-    init_log(start_time, output_dir)
+    logger = init_log(os.path.join(output_dir, "fosslight_src_log_"+start_time+".txt"))
 
     if path_to_scan == "":
         if _windows: