Skip to content

Improve error messages from with-fuseki.sh #1510

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
nicholascar merged 1 commit into from
Dec 16, 2021
Merged

Improve error messages from with-fuseki.sh #1510

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
18 changes: 13 additions & 5 deletions with-fuseki.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ wait_http_okay() {
return 0
}
kill -0 "${pid}" 2>/dev/null 1>&2 || {
1>&2 echo "ERROR: pid ${pid} (${label}) not running anymore ..."
1>&2 echo "ERROR: pid ${pid} (${label}) not running anymore, see log dump below for the possible cause."
return 1
}
1>&2 echo "INFO: url ${url} (${label}) not okay, waiting ..."
sleep 2
done
1>&2 echo "ERROR: timed out trying to load ${url} (${label})"
1>&2 echo "ERROR: timed out trying to load ${url} (${label}), see log dump below for the possible cause."
return 1
}

Expand All @@ -37,7 +37,7 @@ assert_pid_running() {
done

kill -0 "${pid}" 2>/dev/null 1>&2 || {
1>&2 echo "ERROR: pid ${pid} (${label}) not running anymore ..."
1>&2 echo "ERROR: pid ${pid} (${label}) not running anymore, see log dump below for the possible cause."
return 1
}
1>&2 echo "INFO: pid ${pid} (${label}) running"
Expand Down Expand Up @@ -87,12 +87,20 @@ exit_handler() {
1>&2 echo "WARNING: not killing fuseki fuseki_pid_normal=${fuseki_pid_normal} fuseki_pid_tdb=${fuseki_pid_tdb}"
fi

local -a dump_cmd
if [ -n "${FUSEKI_DUMP_FULL_LOGS}" ]
then
dump_cmd=(cat)
else
dump_cmd=(tail -15)
fi

if [ -n "${FUSEKI_DUMP_LOGS}" ] || [ "${xrc}" != "0" ]
then
1>&2 echo "dumping fuseki_log_normal=${fuseki_log_normal}"
cat "${fuseki_log_normal}" || :
"${dump_cmd[@]}" "${fuseki_log_normal}" || :
1>&2 echo "dumping fuseki_log_tdb=${fuseki_log_tdb}"
cat "${fuseki_log_tdb}" || :
"${dump_cmd[@]}" "${fuseki_log_tdb}" || :
fi
}

Expand Down