-
Notifications
You must be signed in to change notification settings - Fork 3
breaking(joex): replace unoconv with unoserver for office conversion #44
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.
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
Open
tiborrr
wants to merge
1
commit into
docspell:main
Choose a base branch
from
tiborrr:fix/unoserver-office-conversion
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,25 @@ | ||
| #!/bin/sh | ||
|
|
||
| echo "Starting unoconv listener" | ||
| unoconv -l & | ||
| set -e | ||
|
|
||
| /opt/docspell-joex/bin/docspell-joex "$@" | ||
| echo "Starting unoserver" | ||
| # Queues office converts so concurrent joex workers do not deadlock LibreOffice. | ||
| # See https://github.com/eikek/docspell/issues/3345 | ||
| unoserver --conversion-timeout 120 & | ||
|
|
||
| echo "Waiting for unoserver to become ready" | ||
| i=0 | ||
| while [ "$i" -lt 60 ]; do | ||
| if unoping >/dev/null 2>&1; then | ||
| echo "unoserver is ready" | ||
| break | ||
| fi | ||
| i=$((i + 1)) | ||
| sleep 1 | ||
| done | ||
|
|
||
| if ! unoping >/dev/null 2>&1; then | ||
| echo "WARNING: unoserver did not become ready within 60s; office conversion may fail" >&2 | ||
| fi | ||
|
|
||
| /opt/docspell-joex/bin/docspell-joex "$@" | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if this whole mess wouldn't better live in joex itself instead of in a random entrypoint script.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(I also didn't like the previous
unoconv -l &line in here)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I totally agree. Sorry my cursor instance was a bit too quick in filing this PR, but I totally agree here. I will investigate.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I also think that a sidecar container in kubernetes would work quite well for this, but not sure how to handle non-kubernetes deployments then.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In docker compose it's also easy. I guess for local deployment peeps just have a single docker unoserver instance running that they can call or install it bare metal I guess and run it in the background.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's good to seperate it