Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix logging to a file with bashlib based processors #1123

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

Merged
kba merged 4 commits into from
Oct 19, 2023
Merged

Fix logging to a file with bashlib based processors #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1574439
fix logging with bashlib to a file
MehmedGIT Oct 19, 2023
bb1c9f9
fix logging tests
MehmedGIT Oct 19, 2023
7b2d162
Merge branch 'fix-bashlib-log' of github.com:OCR-D/core into fix-bash…
MehmedGIT Oct 19, 2023
00fbc44
simplify the fix
MehmedGIT Oct 19, 2023
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
2 changes: 1 addition & 1 deletion ocrd/ocrd/lib.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ ocrd__parse_argv () {
-I|--input-file-grp) ocrd__argv[input_file_grp]=$2 ; shift ;;
-w|--working-dir) ocrd__argv[working_dir]=$(realpath "$2") ; shift ;;
-m|--mets) ocrd__argv[mets_file]=$(realpath "$2") ; shift ;;
--mets-server-url) ocrd_argv[mets_server_url]="$2" ; shift ;;
--mets-server-url) ocrd__argv[mets_server_url]="$2" ; shift ;;
--overwrite) ocrd__argv[overwrite]=true ;;
--profile) ocrd__argv[profile]=true ;;
--profile-file) ocrd__argv[profile_file]=$(realpath "$2") ; shift ;;
Expand Down
1 change: 1 addition & 0 deletions ocrd/ocrd/processor/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ def run_cli(
result = run(args, check=False)
return result.returncode


def generate_processor_help(ocrd_tool, processor_instance=None, subcommand=None):
"""Generate a string describing the full CLI of this processor including params.

Expand Down
8 changes: 3 additions & 5 deletions ocrd_network/ocrd_network/process_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import json
from typing import List, Optional
import logging
from contextlib import nullcontext

from ocrd.processor.helpers import run_cli, run_processor
Expand All @@ -27,13 +26,12 @@ def invoke_processor(

ctx_mgr = redirect_stderr_and_stdout_to_file(log_filename) if log_filename else nullcontext()
with ctx_mgr:
initLogging(force_reinit=True)
workspace = get_ocrd_workspace_instance(
mets_path=abs_path_to_mets,
mets_server_url=mets_server_url
)

if processor_class:
initLogging(force_reinit=True)
try:
run_processor(
processorClass=processor_class,
Expand All @@ -44,7 +42,7 @@ def invoke_processor(
parameter=parameters,
instance_caching=True,
mets_server_url=mets_server_url,
log_level=logging.DEBUG
log_level='DEBUG'
)
except Exception as e:
raise RuntimeError(f"Python executable '{processor_class.__dict__}' exited with: {e}")
Expand All @@ -58,7 +56,7 @@ def invoke_processor(
page_id=page_id,
parameter=json.dumps(parameters),
mets_server_url=mets_server_url,
log_level=logging.DEBUG
log_level='DEBUG'
)
if return_code != 0:
raise RuntimeError(f"CLI executable '{executable}' exited with: {return_code}")