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

Jump to bottom

Fix loglevel type error when starting bashlib worker #1121

Merged
merged 5 commits into from
Oct 19, 2023
Merged

Fix loglevel type error when starting bashlib worker #1121

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4aa1cfb
Fix loglevel type error
joschrew Oct 19, 2023
a5402f8
Accept str and int as loglevel in run_cli
joschrew Oct 19, 2023
2a42695
Remove forgotten debug-prints
joschrew Oct 19, 2023
8519e2f
Update ocrd/ocrd/processor/helpers.py
joschrew Oct 19, 2023
4904b34
Update ocrd/ocrd/processor/helpers.py
joschrew 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
15 changes: 11 additions & 4 deletions ocrd/ocrd/processor/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
from functools import lru_cache
import json
import inspect
from subprocess import run, PIPE
from typing import List, Type
from subprocess import run
from typing import List

from click import wrap_text
from ocrd.workspace import Workspace
from ocrd_utils import freeze_args, getLogger, pushd_popd, config, setOverrideLogLevel
from ocrd_utils import freeze_args, getLogger, config, setOverrideLogLevel
from logging import getLevelName
joschrew marked this conversation as resolved.
Show resolved Hide resolved


__all__ = [
Expand Down Expand Up @@ -198,7 +199,10 @@ def run_cli(
args = [executable, '--working-dir', workspace.directory]
args += ['--mets', mets_url]
if log_level:
args += ['--log-level', log_level]
if isinstance(log_level, str):
args += ['--log-level', log_level]
else:
args += ['--log-level', getLevelName(log_level)]
joschrew marked this conversation as resolved.
Show resolved Hide resolved
if page_id:
args += ['--page-id', page_id]
if input_file_grp:
Expand All @@ -212,6 +216,9 @@ def run_cli(
if mets_server_url:
args += ['--mets-server-url', mets_server_url]
log = getLogger('ocrd.processor.helpers.run_cli')
print("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
print(args)
print("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
log.debug("Running subprocess '%s'", ' '.join(args))
result = run(args, check=False)
return result.returncode
Expand Down