From: Aurelien DARRAGON <adarragon@haproxy.com>
Date: Tue, 4 Jul 2023 15:01:09 +0000 (+0200)
Subject: MEDIUM: fcgi-app: properly postresolve logsrvs
X-Git-Tag: v2.9-dev5~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=486aa01204f535fc5f1541858b6ef40c6e89ffed;p=thirdparty%2Fhaproxy.git

MEDIUM: fcgi-app: properly postresolve logsrvs

Now that we have postresolve_logsrv_list() function, we make use of it
for fcgi-app log postparsing logic.

This will allow this kind of config to work:
  |fcgi-app test
  |        docroot /
  |        log-stderr tcp@127.0.0.1:514 local0

Plus, consistency checks will also be performed as for regular log
directives used from global, log-forward or proxy sections.
---

diff --git a/src/fcgi-app.c b/src/fcgi-app.c
index 16c3c81bb5..829d1b128b 100644
--- a/src/fcgi-app.c
+++ b/src/fcgi-app.c
@@ -645,7 +645,6 @@ static int cfg_fcgi_apps_postparser()
 	struct fcgi_app *curapp;
 	struct proxy *px;
 	struct server *srv;
-	struct logsrv *logsrv;
 	int err_code = 0;
 
 	for (px = proxies_list; px; px = px->next) {
@@ -701,18 +700,7 @@ static int cfg_fcgi_apps_postparser()
 			curapp->maxreqs = 1;
 		}
 
-		list_for_each_entry(logsrv, &curapp->logsrvs, list) {
-			if (logsrv->type == LOG_TARGET_BUFFER) {
-				struct sink *sink = sink_find(logsrv->ring_name);
-
-				if (!sink || sink->type != SINK_TYPE_BUFFER) {
-					ha_alert("fcgi-app '%s' : log server uses unknown ring named '%s'.\n",
-						 curapp->name, logsrv->ring_name);
-					err_code |= ERR_ALERT | ERR_FATAL;
-				}
-				logsrv->sink = sink;
-			}
-		}
+		err_code |= postresolve_logsrv_list(&curapp->logsrvs, "fcgi-app", curapp->name);
 	}
 
   end: