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.

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

don't wait for virus scan to finish #2536

Merged
merged 4 commits into from
Jan 15, 2024
Merged
Changes from 1 commit
Commits
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
10 changes: 9 additions & 1 deletion lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,15 @@ done
check_running_cronjobs() {
while [ -n "$(pgrep -f nextcloud/cron.php)" ]
enoch85 marked this conversation as resolved.
Show resolved Hide resolved
do
countdown "Waiting for the Nextcloud cronjob to finish..." "30"
# Check if virus scan is running, could take ages for it to finish...
if ! "$(pgrep -f clamd)"
enoch85 marked this conversation as resolved.
Show resolved Hide resolved
enoch85 marked this conversation as resolved.
Show resolved Hide resolved
then
# If not running, then keep waiting
countdown "Waiting for the Nextcloud cronjob to finish..." "30"
else
# If virus scan is running, then wait a bit longer, and kill it to release cron.php
countdown "Waiting for the Nextcloud cronjob and virusscan to finish..." "120"
pkill clamd
done
enoch85 marked this conversation as resolved.
Show resolved Hide resolved
enoch85 marked this conversation as resolved.
Show resolved Hide resolved
}

Expand Down