Adjust get fpm status error messages

renatomefi · Jul 29, 2020 · e895b6b · e895b6b
1 parent 953ca22
commit e895b6b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 31 deletions.
diff --git a/php-fpm-healthcheck b/php-fpm-healthcheck
@@ -18,11 +18,14 @@
 # Ping mode with data (outputs php-fpm status text): ./php-fpm-healthcheck -v
 #
 # Exit status codes:
-# 2,9,111 - Couldn't connect to PHP fpm, is it running?
-# 8 - Couldn't reach PHP fpm status page, have you configured it with `pm.status_path = /status`?
 # 1 - A healthcheck condition has failed
+# 2 - Couldn't connect to PHP fpm, is it running?
 # 3 - Invalid option given
 # 4 - One or more required softwares are missing
+# 8 - Couldn't reach PHP fpm status page, have you configured it with `pm.status_path = /status`?
+# 9 - Couldn't connect to PHP fpm, is it running?
+# 10 - Malformed PHP fpm status page
+# 111 - Couldn't connect to PHP fpm, is it running?
 #
 # Available options:
 # -v|--verbose
@@ -52,22 +55,23 @@ command -v grep 1> /dev/null || { >&2 echo "Make sure grep is installed (i.e. ap
 # Get status from fastcgi connection
 # $1 - cgi-fcgi connect argument
 get_fpm_status() {
-    if test "$VERBOSE" = 1; then printf "Trying to connect to php-fpm via: %s%s\\n" "$1" "$SCRIPT_NAME"; fi;
-
-    FPM_STATUS=$(env -i REQUEST_METHOD="$REQUEST_METHOD" SCRIPT_NAME="$SCRIPT_NAME" SCRIPT_FILENAME="$SCRIPT_FILENAME" "$FCGI_CMD_PATH" -bind -connect "$1" 2> /dev/null)
-    RESPONSE_CODE=$(echo "$FPM_STATUS" | grep -o -E "^Status:\s*\d{3}" | sed 's/[^0-9]*//g')
-    FPM_STATUS=$(echo "$FPM_STATUS" | tail +5)
+    if test "$VERBOSE" = 1; then printf "Trying to connect to PHP-FPM via: %s%s\\n" "$1" "$SCRIPT_NAME"; fi;
 
-    if test "$VERBOSE" = 1; then printf "php-fpm status output:\\n%s\\n" "$FPM_STATUS"; fi;
+    FPM_STATUS=$(env -i REQUEST_METHOD="$REQUEST_METHOD" SCRIPT_NAME="$SCRIPT_NAME" SCRIPT_FILENAME="$SCRIPT_FILENAME" "$FCGI_CMD_PATH" -bind -connect "$1" 2> /dev/null)
 
+    RESPONSE_CODE=$(echo "$FPM_STATUS" | grep -o -E "^Status:\s*\d{3}" | sed 's/[^0-9]*//g')
     if ! test "$RESPONSE_CODE" -eq "$RESPONSE_CODE" 2> /dev/null; then
-       return
+        >&2 echo "Malformed PHP-FPM status page. Aborting.";
+        exit 10;
     fi
 
     if test "$RESPONSE_CODE" -lt 200 -o "$RESPONSE_CODE" -ge 400; then
-        >&2 printf "php-fpm status page non reachable\\n";
+        >&2 printf "Unable to reach PHP-FPM status page. Response code: %s\\n" "$RESPONSE_CODE";
         exit 8;
     fi;
+
+    FPM_STATUS=$(echo "$FPM_STATUS" | tail +5)
+    if test "$VERBOSE" = 1; then printf "PHP-FPM status output:\\n%s\\n" "$FPM_STATUS"; fi;
 }
 
 # $1 - fpm option
@@ -113,7 +117,7 @@ check_fpm_health() {
 }
 
 if ! GETOPT=$(getopt -o v --long verbose,accepted-conn:,listen-queue:,max-listen-queue:,listen-queue-len:,idle-processes:,active-processes:,total-processes:,max-active-processes:,max-children-reached:,slow-requests: -n 'php-fpm-healthcheck' -- "$@"); then
-    >&2 echo "Invalid options, terminating." ; exit 3
+    >&2 echo "Invalid options. Aborting." ; exit 3
 fi;
 
 eval set -- "$GETOPT"

diff --git a/test/testinfra/test_fpm.py b/test/testinfra/test_fpm.py
@@ -22,9 +22,8 @@ def test_exit_when_no_status_page_is_configured(host, setup_fpm_to_default_fixtu
 
     cmd = host.run("php-fpm-healthcheck -v")
     assert cmd.rc == 8
-    assert "Trying to connect to php-fpm via:" in cmd.stdout
-    assert "status output:" in cmd.stdout
-    assert "php-fpm status page non reachable" in cmd.stderr
+    assert "Trying to connect to PHP-FPM via:" in cmd.stdout
+    assert "Unable to reach PHP-FPM status page. Response code: 404" in cmd.stderr
 
 @pytest.mark.php_fpm
 def test_fpm_on_socket(host, setup_fpm_to_default_fixture):
@@ -34,54 +33,53 @@ def test_fpm_on_socket(host, setup_fpm_to_default_fixture):
 
     cmd = host.run("FCGI_CONNECT=/var/run/php-fpm.sock php-fpm-healthcheck -v")
     assert cmd.rc == 0
-    assert "Trying to connect to php-fpm via:" in cmd.stdout
-    assert "status output:" in cmd.stdout
+    assert "Trying to connect to PHP-FPM via:" in cmd.stdout
+    assert "PHP-FPM status output:" in cmd.stdout
     assert "pool:" in cmd.stdout
 
 # https://github.com/renatomefi/php-fpm-healthcheck/issues/18
 @pytest.mark.php_fpm
 def test_fpm_on_socket_with_huge_env(host, setup_fpm_to_default_fixture):
     cmd = host.run("HUGE_ENV=\"$(dd if=/dev/zero bs=8192 count=1 | tr '\\000' '\\040')\" php-fpm-healthcheck -v")
     assert cmd.rc == 0
-    assert "Trying to connect to php-fpm via:" in cmd.stdout
-    assert "status output:" in cmd.stdout
+    assert "Trying to connect to PHP-FPM via:" in cmd.stdout
+    assert "PHP-FPM status output:" in cmd.stdout
     assert "pool:" in cmd.stdout
 
 @pytest.mark.php_fpm
 def test_default_status_page_path(host, setup_fpm_to_default_fixture):
     cmd = host.run("php-fpm-healthcheck -v")
     assert cmd.rc == 0
-    assert "Trying to connect to php-fpm via: localhost:9000/status" in cmd.stdout
+    assert "Trying to connect to PHP-FPM via: localhost:9000/status" in cmd.stdout
 
 @pytest.mark.php_fpm
 def test_exit_when_fpm_is_invalid_path(host, setup_fpm_to_default_fixture):
     cmd = host.run("FCGI_STATUS_PATH=/invalid php-fpm-healthcheck -v")
     assert cmd.rc == 8
-    assert "Trying to connect to php-fpm via: localhost:9000/invalid" in cmd.stdout
-    assert "File not found." in cmd.stdout
-    assert "php-fpm status page non reachable" in cmd.stderr
+    assert "Trying to connect to PHP-FPM via: localhost:9000/invalid" in cmd.stdout
+    assert "Unable to reach PHP-FPM status page. Response code: 404" in cmd.stderr
 
 @pytest.mark.alpine
 def test_exit_when_fpm_is_not_reachable_apk(host, setup_fpm_to_default_fixture):
     cmd = host.run("FCGI_CONNECT=localhost:9001 php-fpm-healthcheck -v")
     assert cmd.rc in (111, 9)
-    assert "Trying to connect to php-fpm via: localhost:9001" in cmd.stdout
+    assert "Trying to connect to PHP-FPM via: localhost:9001" in cmd.stdout
 
 @pytest.mark.alpine
 def test_exit_when_fpm_is_invalid_host_apk(host, setup_fpm_to_default_fixture):
     cmd = host.run("FCGI_CONNECT=abc php-fpm-healthcheck -v")
     assert cmd.rc in (2, 9)
-    assert "Trying to connect to php-fpm via: abc" in cmd.stdout
+    assert "Trying to connect to PHP-FPM via: abc" in cmd.stdout
 
 @pytest.mark.stretch
 def test_exit_when_fpm_is_not_reachable_apt(host, setup_fpm_to_default_fixture):
     cmd = host.run("FCGI_CONNECT=localhost:9001 php-fpm-healthcheck -v")
     assert cmd.rc == 111
-    assert "Trying to connect to php-fpm via: localhost:9001" in cmd.stdout
+    assert "Trying to connect to PHP-FPM via: localhost:9001" in cmd.stdout
 
 @pytest.mark.stretch
 def test_exit_when_fpm_is_invalid_host_apt(host, setup_fpm_to_default_fixture):
     cmd = host.run("FCGI_CONNECT=abc php-fpm-healthcheck -v")
     assert cmd.rc == 2
-    assert "Trying to connect to php-fpm via: abc" in cmd.stdout
+    assert "Trying to connect to PHP-FPM via: abc" in cmd.stdout
 
diff --git a/test/testinfra/test_metrics.py b/test/testinfra/test_metrics.py
@@ -19,14 +19,14 @@ def test_metric_fail_accepted_conn_with_other_metrics(host):
 def test_metric_accepted_conn(host):
     cmd = host.run("php-fpm-healthcheck -v")
     assert cmd.rc == 0
-    assert "Trying to connect to php-fpm via:" in cmd.stdout
-    assert "status output:" in cmd.stdout
+    assert "Trying to connect to PHP-FPM via:" in cmd.stdout
+    assert "PHP-FPM status output:" in cmd.stdout
     assert "pool:" in cmd.stdout
 
 @pytest.mark.php_fpm
 def test_listen_queue_len_and_listen_queue_vars_are_parsed_correctly(host):
     cmd = host.run("php-fpm-healthcheck --verbose --listen-queue=5 --max-listen-queue=1024")
     assert cmd.rc == 0
-    assert "Trying to connect to php-fpm via:" in cmd.stdout
+    assert "Trying to connect to PHP-FPM via:" in cmd.stdout
     assert "'listen queue' value '0' and expected is less than '5" in cmd.stdout
     assert "'max listen queue' value '0' and expected is less than '1024'" in cmd.stdout
diff --git a/test/testinfra/test_ping.py b/test/testinfra/test_ping.py
@@ -9,6 +9,6 @@ def test_ping(host):
 def test_ping_verbose(host):
     cmd = host.run("php-fpm-healthcheck -v")
     assert cmd.rc == 0
-    assert "Trying to connect to php-fpm via:" in cmd.stdout
-    assert "status output:" in cmd.stdout
+    assert "Trying to connect to PHP-FPM via:" in cmd.stdout
+    assert "PHP-FPM status output:" in cmd.stdout
     assert "pool:" in cmd.stdout