From 5b6cda6523705c84139808802afc88e27489680f Mon Sep 17 00:00:00 2001 From: Benjamin Cremer Date: Wed, 8 May 2024 12:33:52 +0200 Subject: [PATCH] Fix GH-14175: Use two digit float specifier for FPM systemd format req rate Close GH-14175 --- NEWS | 4 ++++ sapi/fpm/fpm/fpm_systemd.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index ac8ee18065b..19541227cf6 100644 --- a/NEWS +++ b/NEWS @@ -23,6 +23,10 @@ PHP NEWS . Fix crash in ParentNode::append() when dealing with a fragment containing text nodes. (nielsdos) +- FPM: + . Fix bug GH-14175 (Show decimal number instead of scientific notation in + systemd status). (Benjamin Cremer) + - Hash: . ext/hash: Swap the checking order of `__has_builtin` and `__GNUC__` (Saki Takamachi) diff --git a/sapi/fpm/fpm/fpm_systemd.c b/sapi/fpm/fpm/fpm_systemd.c index 17531241233..d5858ac780d 100644 --- a/sapi/fpm/fpm/fpm_systemd.c +++ b/sapi/fpm/fpm/fpm_systemd.c @@ -29,13 +29,13 @@ static void fpm_systemd(void) } /* - zlog(ZLOG_DEBUG, "systemd %s (Processes active:%d, idle:%d, Requests:%lu, slow:%lu, Traffic:%.3greq/sec)", + zlog(ZLOG_DEBUG, "systemd %s (Processes active:%d, idle:%d, Requests:%lu, slow:%lu, Traffic:%.2freq/sec)", fpm_global_config.systemd_watchdog ? "watchdog" : "heartbeat", active, idle, requests, slow_req, ((float)requests - last) * 1000.0 / fpm_global_config.systemd_interval); */ if (0 > sd_notifyf(0, "READY=1\n%s" - "STATUS=Processes active: %d, idle: %d, Requests: %lu, slow: %lu, Traffic: %.3greq/sec", + "STATUS=Processes active: %d, idle: %d, Requests: %lu, slow: %lu, Traffic: %.2freq/sec", fpm_global_config.systemd_watchdog ? "WATCHDOG=1\n" : "", active, idle, requests, slow_req, ((float)requests - last) * 1000.0 / fpm_global_config.systemd_interval)) { zlog(ZLOG_NOTICE, "failed to notify status to systemd");