Skip to content
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

Merge init_log & init_log_item functiions #15

Merged
merged 1 commit into from
Aug 12, 2021
+8 −8
Merged

Merge init_log & init_log_item functiions #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/fosslight_oss_pkg/fosslight_oss_pkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from yaml import safe_dump
from fosslight_reuse._help import print_help_msg
from fosslight_util.constant import LOGGER_NAME
from fosslight_util.set_log import init_log, init_log_item
from fosslight_util.set_log import init_log
from ._parsing_yaml import convert_yml_to_excel
from ._parsing_excel import convert_excel_to_yaml

Expand Down Expand Up @@ -59,8 +59,8 @@ def convert_report(base_path, files, output_name):
except Exception:
pass

logger = init_log(os.path.join(output_dir, "fosslight_reuse_log_"+now+".txt"))
_result_log = init_log_item(_PKG_NAME, base_path)
logger, _result_log = init_log(os.path.join(output_dir, "fosslight_reuse_log_"+now+".txt"),
True, logging.INFO, logging.DEBUG, _PKG_NAME, base_path)

if base_path != "":
convert_yml_mode = True
Expand Down
6 changes: 3 additions & 3 deletions src/fosslight_reuse/_fosslight_reuse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from datetime import datetime
from binaryornot.check import is_binary
import fosslight_util.constant as constant
from fosslight_util.set_log import init_log, init_log_item
from fosslight_util.set_log import init_log
from yaml import safe_dump
from reuse import report
from reuse.project import Project
Expand Down Expand Up @@ -294,8 +294,8 @@ def init(path_to_find, result_file, file_list):

_start_time = datetime.now().strftime('%Y%m%d_%H-%M-%S')
output_dir = os.path.dirname(os.path.abspath(result_file))
logger = init_log(os.path.join(output_dir, "fosslight_reuse_log_"+_start_time+".txt"))
_result_log = init_log_item(_PKG_NAME, path_to_find)
logger, _result_log = init_log(os.path.join(output_dir, "fosslight_reuse_log_"+_start_time+".txt"),
True, logging.INFO, logging.DEBUG, _PKG_NAME, path_to_find)
if file_list:
_result_log["File list to check"] = file_list

Expand Down
4 changes: 2 additions & 2 deletions src/fosslight_reuse/_help.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

Parameters:
Mode
lint\t\t\t Check REUSE compliance
report\t\t\t oss_pkg_info.yaml <-> FOSSLight-Report.xml
lint\t\t Check REUSE compliance
report\t\t oss_pkg_info.yaml <-> FOSSLight-Report.xml

Options:
-h\t\t\t Print help message
Expand Down