Fix error checking + updated comments

This commit is contained in:
Patrick Van der Veken 2020-04-11 11:45:14 +02:00
parent 68eced6aa4
commit 3e859f3c27
2 changed files with 6 additions and 4 deletions

View File

@ -11,7 +11,7 @@
# [default: no] # [default: no]
log_healthy="no" log_healthy="no"
# specify UBC names to exclude from being checked (comma-separated list) # specify UBC names to exclude (comma-separated list) (release >20200411)
# [default: none] # [default: none]
# Examples: numfile,numpty # Examples: numfile,numpty
exclude_counters="" exclude_counters=""

View File

@ -64,6 +64,7 @@ typeset _UBC_HELD=""
typeset _UBC_MAX_HELD="" typeset _UBC_MAX_HELD=""
typeset _UBC_STATE_FILE_STUB="${STATE_PERM_DIR}/vzct.failtcnt" typeset _UBC_STATE_FILE_STUB="${STATE_PERM_DIR}/vzct.failtcnt"
typeset _UBC_STATE_FILE="" typeset _UBC_STATE_FILE=""
typeset _RC=0
# handle arguments (originally comma-separated) # handle arguments (originally comma-separated)
for _ARG in ${_ARGS} for _ARG in ${_ARGS}
@ -231,6 +232,7 @@ do
done done
else else
warn "unable to find UBC data for CT ID ${_CT_ID}" warn "unable to find UBC data for CT ID ${_CT_ID}"
_RC=$(( _RC + 1 ))
continue continue
fi fi
done done
@ -239,7 +241,7 @@ done
print "==== ${_UBC_FILE} ====" >>${HC_STDOUT_LOG} print "==== ${_UBC_FILE} ====" >>${HC_STDOUT_LOG}
print "${_UBC_OUTPUT}" >>${HC_STDOUT_LOG} print "${_UBC_OUTPUT}" >>${HC_STDOUT_LOG}
return 0 return ${_RC}
} }
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -249,13 +251,13 @@ cat <<- EOT
NAME : $1 NAME : $1
VERSION : $2 VERSION : $2
CONFIG : $3 with parameters: CONFIG : $3 with parameters:
exclude_counters=<ubc_name>,<ubc_name>,... exclude_counters=<ubc_name>,<ubc_name>,... (release >20200411)
with formatted stanzas: with formatted stanzas:
ct:<ct_id> ct:<ct_id>
PURPOSE : Checks whether UBC (User Bean Counters) for OpenVZ containers have PURPOSE : Checks whether UBC (User Bean Counters) for OpenVZ containers have
increased (failures) increased (failures)
LOG HEALTHY : Supported LOG HEALTHY : Supported
NOTES : Supports OpenVZ 6.x & OpenVZ 7.x NOTES : Supports OpenVZ 6.x & OpenVZ 7.x (release >20200411)
EOT EOT