diff --git a/check_webservice_load.sh b/check_webservice_load.sh index 4a28241..d95bdbb 100755 --- a/check_webservice_load.sh +++ b/check_webservice_load.sh @@ -756,9 +756,7 @@ stop_mysql() { # - if [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ; then if $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then - if $terminal ; then - warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." - fi + warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." return 1 fi fi @@ -833,9 +831,7 @@ stop_postgresql() { # - if [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ; then if $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then - if $terminal ; then - warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." - fi + warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." return 1 fi fi @@ -933,9 +929,7 @@ stop_php_fpm() { # - if [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ; then if $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then - if $terminal ; then - warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." - fi + warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." return 1 fi fi @@ -984,9 +978,7 @@ stop_php_fpm() { # - if [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ; then if $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then - if $terminal ; then - warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." - fi + warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." return 1 fi fi @@ -1040,9 +1032,7 @@ stop_php_fpm() { # - if [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ; then if $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then - if $terminal ; then - warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." - fi + warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." return 1 fi fi @@ -1079,9 +1069,7 @@ stop_redis() { # - if [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ; then if $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then - if $terminal ; then - warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." - fi + warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." return 1 fi fi @@ -1139,9 +1127,7 @@ stop_redis() { # - if [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ; then if $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then - if $terminal ; then - warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." - fi + warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." return 1 fi fi @@ -1165,9 +1151,7 @@ start_mysql() { # - if [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ; then if $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then - if $terminal ; then - warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." - fi + warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." return 1 fi fi @@ -1231,9 +1215,7 @@ start_postgresql() { # - if [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ; then if $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then - if $terminal ; then - warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." - fi + warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." return 1 fi fi @@ -1300,9 +1282,7 @@ start_apache() { # - if [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ; then if $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then - if $terminal ; then - warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." - fi + warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." return 1 fi fi @@ -1368,9 +1348,7 @@ start_nginx() { # - if [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ; then if $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then - if $terminal ; then - warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." - fi + warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." return 1 fi fi @@ -1439,9 +1417,7 @@ start_php_fpm() { # - if [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ; then if $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then - if $terminal ; then - warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." - fi + warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." return 1 fi fi @@ -1515,9 +1491,7 @@ start_redis() { # - if [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ; then if $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then - if $terminal ; then - warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." - fi + warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." return 1 fi fi @@ -1670,9 +1644,7 @@ graceful_restart_php_fpm() { # - if [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ; then if $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then - if $terminal ; then - warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." - fi + warn "It seems that package management (apt,dpkg) is running. Exiting '${FUNCNAME[0]}' now.." return 1 fi fi