cleaning old codes
This commit is contained in:
+7
-7
@@ -174,17 +174,18 @@ function on_error {
|
||||
last_error="${tmp_error[-1]}"
|
||||
regex2='^[[:space:]]+miaou_trace: source=(.*) lineno=(.*) funcname=(.*)$'
|
||||
if [[ "$last_error" =~ $regex2 ]]; then
|
||||
miaou_debug "<miaou_trace>"
|
||||
trace_source="${BASH_REMATCH[1]}"
|
||||
trace_lineno="${BASH_REMATCH[2]}"
|
||||
trace_funcname="${BASH_REMATCH[3]}"
|
||||
extra_source=("$trace_source")
|
||||
extra_lineno=("$trace_lineno")
|
||||
extra_funcname=("$trace_funcname")
|
||||
miaou_debug "<miaou_trace found_first source=${extra_source} lineno=${extra_lineno} funcname=${extra_funcname}/>"
|
||||
# miaou_debug "<miaou_trace found_first source=${extra_source} lineno=${extra_lineno} funcname=${extra_funcname}/>"
|
||||
# go backward
|
||||
for ((i = ${#tmp_error[@]} - 2; i >= 0; i--)); do
|
||||
content=${tmp_error[$i]}
|
||||
miaou_debug "<index i=$i content=$content>"
|
||||
# miaou_debug "<index i=$i content=$content>"
|
||||
if [[ "$content" =~ $regex2 ]]; then
|
||||
source="${BASH_REMATCH[1]}"
|
||||
lineno="${BASH_REMATCH[2]}"
|
||||
@@ -192,7 +193,7 @@ function on_error {
|
||||
extra_source=("$source" "${extra_source[@]}")
|
||||
extra_lineno=("$lineno" "${extra_lineno[@]}")
|
||||
extra_funcname=("$funcname" "${extra_funcname[@]}")
|
||||
miaou_debug '<miaou_trace found_remainders/>'
|
||||
# miaou_debug '<miaou_trace found_remainders/>'
|
||||
else
|
||||
regex2='^(.*): line ([0-9]+): miaou_error: (.*) [0-9]+(.*)$'
|
||||
if [[ "$content" =~ $regex2 ]]; then
|
||||
@@ -203,16 +204,15 @@ function on_error {
|
||||
[[ -n "$optional_payload" ]] &&
|
||||
optional_payload="${optional_payload# payload: }" &&
|
||||
failure_payload="${failure_payload} ${optional_payload}"
|
||||
miaou_debug "<child_error type=${failure_payload} optional={${optional_payload}} found/>"
|
||||
miaou_debug "<child_error extra_traces=${#extra_source[@]} payload={${failure_payload}}/>"
|
||||
else
|
||||
miaou_debug '<child_error no_miaou_error weird=true/>'
|
||||
fi
|
||||
break
|
||||
fi
|
||||
miaou_debug '</index>'
|
||||
# miaou_debug '</index>'
|
||||
done
|
||||
miaou_debug "<extra_trace count=${#extra_source[@]}/>"
|
||||
miaou_debug "</miaou_trace found>"
|
||||
miaou_debug "</miaou_trace/>"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user