Skip to content

Commit 148b9ac

Browse files
committed
spelling: milli [API] fpm_log_write
This adds milli/milliseconds but retains support for mili/miliseconds Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
1 parent 8ae474a commit 148b9ac

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

sapi/fpm/fpm/fpm_log.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,11 @@ int fpm_log_write(char *log_format) /* {{{ */
205205
len2 = snprintf(b, FPM_LOG_BUFFER - len, "%.3f", proc.duration.tv_sec + proc.duration.tv_usec / 1000000.);
206206
}
207207

208-
/* miliseconds */
209-
} else if (!strcasecmp(format, "miliseconds") || !strcasecmp(format, "mili")) {
208+
/* milliseconds */
209+
} else if (!strcasecmp(format, "milliseconds") || !strcasecmp(format, "milli") ||
210+
/* mili/miliseconds are supported for backwards compatibility */
211+
!strcasecmp(format, "miliseconds") || !strcasecmp(format, "mili")
212+
) {
210213
if (!test) {
211214
len2 = snprintf(b, FPM_LOG_BUFFER - len, "%.3f", proc.duration.tv_sec * 1000. + proc.duration.tv_usec / 1000.);
212215
}
@@ -218,7 +221,7 @@ int fpm_log_write(char *log_format) /* {{{ */
218221
}
219222

220223
} else {
221-
zlog(ZLOG_WARNING, "only 'seconds', 'mili', 'miliseconds', 'micro' or 'microseconds' are allowed as a modifier for %%%c ('%s')", *s, format);
224+
zlog(ZLOG_WARNING, "only 'seconds', 'milli', 'milliseconds', 'micro' or 'microseconds' are allowed as a modifier for %%%c ('%s')", *s, format);
222225
return -1;
223226
}
224227
format[0] = '\0';

sapi/fpm/www.conf.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ pm.max_spare_servers = 3
295295
; it can accept the following format:
296296
; - %{seconds}d (default)
297297
; - %{milliseconds}d
298-
; - %{mili}d
298+
; - %{milli}d
299299
; - %{microseconds}d
300300
; - %{micro}d
301301
; %e: an environment variable (same as $_ENV or $_SERVER)
@@ -340,7 +340,7 @@ pm.max_spare_servers = 3
340340
; %u: remote user
341341
;
342342
; Default: "%R - %u %t \"%m %r\" %s"
343-
;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"
343+
;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{milli}d %{kilo}M %C%%"
344344

345345
; The log file for slow requests
346346
; Default Value: not set

0 commit comments

Comments
 (0)