Skip to content
Snippets Groups Projects
Commit c420e640 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

Merge branch 'react-on-pipe-in-output' into 'master'

fix messed data instead abort

See merge request !18
parents 68e2cd58 c565c1f3
No related branches found
No related tags found
1 merge request!18fix messed data instead abort
......@@ -362,9 +362,10 @@ function processCheck(){
iPipes=$( sed 's#[^|]##g' "$_outfile" | grep "." | wc -L )
_echo "Pipe chars: $iPipes"
if [[ $iPipes -gt 1 ]]; then
_elog "ABORT - pipes were found in plugin output"
_elog "WARNING - pipes were found in plugin output"
_elog "command was: $myFullscript $myparams"
exit 1
_log "${_logPrefix} WARNING - pipes were found in plugin output"
sed -i "s#|#:#g" "$_outfile"
fi
_echo
......@@ -372,9 +373,10 @@ function processCheck(){
# echo $outPerfdata
# echo
if ! test -n "$outPerfdata" && echo "$outPerfdata" | grep "=[0-9\.]*;[0-9\.]*;[0-9\.]*;[0-9\.]*;" >/dev/null; then
_elog "ABORT - this does not look like performance data: $outPerfdata"
_elog "WARNING - this does not look like performance data: $outPerfdata"
_elog "command was: $myFullscript $myparams"
exit 1
_log "${_logPrefix} this does not look like performance data: $outPerfdata"
outPerfdata=""
fi
_log "${_logPrefix} check command finished with returncode $rc"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment