Mise à jour du format de journalisation dans les fichiers Caddyfile pour utiliser JSON au lieu de console, et ajout de guillemets autour du chemin du fichier dans la configuration du worker FrankenPHP.

arnaud-ritti · arnaud-ritti · commit 35e9b830343c · 2025-11-03T20:08:33.000+01:00
diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/address/alert.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/address/alert.caddyfile
@@ -1,5 +1,5 @@
 log {
-	format {$CADDY_LOG_FORMAT:console}
+	format {$CADDY_LOG_FORMAT:json}
 	output {$CADDY_LOG_OUTPUT:stdout}
 	level {$CADDY_SERVER_LOG_LEVEL:ERROR}
 }
diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/address/crit.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/address/crit.caddyfile
@@ -1,5 +1,5 @@
 log {
-	format {$CADDY_LOG_FORMAT:console}
+	format {$CADDY_LOG_FORMAT:json}
 	output {$CADDY_LOG_OUTPUT:stdout}
 	level {$CADDY_SERVER_LOG_LEVEL:ERROR}
 }
diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/address/debug.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/address/debug.caddyfile
@@ -1,5 +1,5 @@
 log {
-	format {$CADDY_LOG_FORMAT:console}
+	format {$CADDY_LOG_FORMAT:json}
 	output {$CADDY_LOG_OUTPUT:stdout}
 	level {$CADDY_SERVER_LOG_LEVEL:INFO}
 }
diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/address/emerg.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/address/emerg.caddyfile
@@ -1,5 +1,5 @@
 log {
-	format {$CADDY_LOG_FORMAT:console}
+	format {$CADDY_LOG_FORMAT:json}
 	output {$CADDY_LOG_OUTPUT:stdout}
 	level {$CADDY_SERVER_LOG_LEVEL:ERROR}
 }
diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/address/error.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/address/error.caddyfile
@@ -1,5 +1,5 @@
 log {
-	format {$CADDY_LOG_FORMAT:console}
+	format {$CADDY_LOG_FORMAT:json}
 	output {$CADDY_LOG_OUTPUT:stdout}
 	level {$CADDY_SERVER_LOG_LEVEL:ERROR}
 }
diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/address/info.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/address/info.caddyfile
@@ -1,5 +1,5 @@
 log {
-	format {$CADDY_LOG_FORMAT:console}
+	format {$CADDY_LOG_FORMAT:json}
 	output {$CADDY_LOG_OUTPUT:stdout}
 	level {$CADDY_SERVER_LOG_LEVEL:INFO}
 }
diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/address/notice.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/address/notice.caddyfile
@@ -1,5 +1,5 @@
 log {
-	format {$CADDY_LOG_FORMAT:console}
+	format {$CADDY_LOG_FORMAT:json}
 	output {$CADDY_LOG_OUTPUT:stdout}
 	level {$CADDY_SERVER_LOG_LEVEL:INFO}
 }
diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/address/warn.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/address/warn.caddyfile
@@ -1,5 +1,5 @@
 log {
-	format {$CADDY_LOG_FORMAT:console}
+	format {$CADDY_LOG_FORMAT:json}
 	output {$CADDY_LOG_OUTPUT:stdout}
 	level {$CADDY_SERVER_LOG_LEVEL:WARN}
 }
diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/global/alert.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/global/alert.caddyfile
@@ -1,5 +1,5 @@
 log {
-	format {$CADDY_LOG_FORMAT:console}
+	format {$CADDY_LOG_FORMAT:json}
 	output {$CADDY_LOG_OUTPUT:stdout}
 	level {$CADDY_SERVER_LOG_LEVEL:ERROR}
 }
diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/global/crit.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/global/crit.caddyfile
@@ -1,5 +1,5 @@
 log {
-	format {$CADDY_LOG_FORMAT:console}
+	format {$CADDY_LOG_FORMAT:json}
 	output {$CADDY_LOG_OUTPUT:stdout}
 	level {$CADDY_SERVER_LOG_LEVEL:ERROR}
 }
diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/global/debug.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/global/debug.caddyfile
@@ -1,6 +1,6 @@
 debug
 log {
-	format {$CADDY_LOG_FORMAT:console}
+	format {$CADDY_LOG_FORMAT:json}
 	output {$CADDY_LOG_OUTPUT:stdout}
 	level {$CADDY_SERVER_LOG_LEVEL:DEBUG}
 }
diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/global/emerg.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/global/emerg.caddyfile
@@ -1,5 +1,5 @@
 log {
-	format {$CADDY_LOG_FORMAT:console}
+	format {$CADDY_LOG_FORMAT:json}
 	output {$CADDY_LOG_OUTPUT:stdout}
 	level {$CADDY_SERVER_LOG_LEVEL:ERROR}
 }
diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/global/error.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/global/error.caddyfile
@@ -1,5 +1,5 @@
 log {
-	format {$CADDY_LOG_FORMAT:console}
+	format {$CADDY_LOG_FORMAT:json}
 	output {$CADDY_LOG_OUTPUT:stdout}
 	level {$CADDY_SERVER_LOG_LEVEL:ERROR}
 }
diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/global/info.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/global/info.caddyfile
@@ -1,5 +1,5 @@
 log {
-	format {$CADDY_LOG_FORMAT:console}
+	format {$CADDY_LOG_FORMAT:json}
 	output {$CADDY_LOG_OUTPUT:stdout}
 	level {$CADDY_SERVER_LOG_LEVEL:INFO}
 }
diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/global/notice.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/global/notice.caddyfile
@@ -1,5 +1,5 @@
 log {
-	format {$CADDY_LOG_FORMAT:console}
+	format {$CADDY_LOG_FORMAT:json}
 	output {$CADDY_LOG_OUTPUT:stdout}
 	level {$CADDY_SERVER_LOG_LEVEL:INFO}
 }
diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/global/warn.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/global/warn.caddyfile
@@ -1,5 +1,5 @@
 log {
-	format {$CADDY_LOG_FORMAT:console}
+	format {$CADDY_LOG_FORMAT:json}
 	output {$CADDY_LOG_OUTPUT:stdout}
 	level {$CADDY_SERVER_LOG_LEVEL:WARN}
 }
diff --git a/src/variations/frankenphp/etc/frankenphp/worker/frankenphp.caddyfile b/src/variations/frankenphp/etc/frankenphp/worker/frankenphp.caddyfile
@@ -1,7 +1,8 @@
 # FrankenPHP worker configuration
 frankenphp {
+	php_ini variables_order "EGPCS"
 	worker {
-		file {$CADDY_APP_PUBLIC_PATH:/var/www/html/public}/frankenphp-worker.php
+		file "{$CADDY_APP_PUBLIC_PATH:/var/www/html/public}/frankenphp-worker.php"
 		{$FRANKENPHP_WORKER_CONFIG}
 	}
 	{$FRANKENPHP_CONFIG}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`log {`
`2`		`- format {$CADDY_LOG_FORMAT:console}`
	`2`	`+ format {$CADDY_LOG_FORMAT:json}`
`3`	`3`	`output {$CADDY_LOG_OUTPUT:stdout}`
`4`	`4`	`level {$CADDY_SERVER_LOG_LEVEL:ERROR}`
`5`	`5`	`}`