Silent file descriptor checks
In order to avoid spam in journald, we just get the exit code and let the checker output the error message. Also, correct how we retrieve process in the healthcheck_port and _listen functions. "ss" doesn't allow to match some processes, like "neutron-l3-agent". We therefore use the PID instead, provided by "pgrep". The "-d" option of pgrep allow to prepare its output for the "grep -E", preventing any need of a loop. Change-Id: I1555a9b79c954e646fe9ae35272231c581cea03e Closes-Bug: #1821782 Closes-Bug: #1821856 (cherry picked from commit5312bf19c8
) (cherry picked from commit89d2393ea9
)
This commit is contained in:
parent
e93f299b0f
commit
16776e3979
|
@ -14,31 +14,21 @@ healthcheck_curl () {
|
|||
healthcheck_port () {
|
||||
process=$1
|
||||
|
||||
# ss truncate command name to 15 characters and this behaviour
|
||||
# cannot be diabled
|
||||
if [ ${#process} -gt 15 ] ; then
|
||||
process=${process:0:15}
|
||||
fi
|
||||
|
||||
shift 1
|
||||
args=$@
|
||||
ports=${args// /|}
|
||||
ss -ntp | awk '{print $5,"-",$6}' | egrep ":($ports)" | grep "$process"
|
||||
pids=$(pgrep -d '|' -f $process)
|
||||
ss -ntp | grep -qE ":($ports).*,pid=($pids),"
|
||||
}
|
||||
|
||||
healthcheck_listen () {
|
||||
process=$1
|
||||
|
||||
# ss truncate command name to 15 characters and this behaviour
|
||||
# cannot be diabled
|
||||
if [ ${#process} -gt 15 ] ; then
|
||||
process=${process:0:15}
|
||||
fi
|
||||
|
||||
shift 1
|
||||
args=$@
|
||||
ports=${args// /|}
|
||||
ss -lnp | awk '{print $5,"-",$7}' | egrep ":($ports)" | grep "$process"
|
||||
pids=$(pgrep -d '|' -f $process)
|
||||
ss -lnp | grep -qE ":($ports).*,pid=($pids),"
|
||||
}
|
||||
|
||||
get_config_val () {
|
||||
|
|
Loading…
Reference in New Issue