caddy-frontend: Fix log destination for failover access

software/caddy-frontend/buildout.hash.cfg

@@ -110,7 +110,7 @@ md5sum = 225ce18b9218de4169327a206051a92e
 
 [template-backend-haproxy-rsyslogd-conf]
 _update_hash_filename_ = templates/backend-haproxy-rsyslogd.conf.in
-md5sum = 3ec9e088817f6a0e3b3b71919590e6b3
+md5sum = 3336d554661b138dcef97b1d1866803c
 
 [template-slave-introspection-httpd-nginx]
 _update_hash_filename_ = templates/slave-introspection-httpd-nginx.conf.in

software/caddy-frontend/templates/backend-haproxy-rsyslogd.conf.in

@@ -16,7 +16,7 @@ $Umask 0022
 $WorkDirectory {{ configuration['spool-directory'] }}
 
 # Setup logging per slave, by extracting the slave name from the log stream
-{%- set regex = ".*-backend (.*)-http.{0,1}/" %}
+{%- set regex = ".*-backend (.*)-http.{0,1}(|-failover)/" %}
 template(name="extract_slave_name" type="string" string="%msg:R,ERE,1,FIELD:{{ regex }}--end%")
 set $!slave_name = exec_template("extract_slave_name");
 template(name="slave_output" type="string" string="{{ configuration['caddy-log-directory'] }}/%$!slave_name%_backend_log")

software/caddy-frontend/test/test.py

@@ -7329,9 +7329,32 @@ backend _health-check-default-http
     self.assertEqualResultJson(
       result, 'Path', '/failover-https-url?a=b&c=/failoverpath')
 
+    self.assertLastLogLineRegexp(
+      '_health-check-failover-url_backend_log',
+      r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d+ '
+      r'\[\d{2}\/.{3}\/\d{4}\:\d{2}\:\d{2}\:\d{2}.\d{3}\] '
+      r'https-backend _health-check-failover-url-https-failover'
+      r'\/_health-check-failover-url-backend '
+      r'\d+/\d+\/\d+\/\d+\/\d+ '
+      r'200 \d+ - - ---- '
+      r'\d+\/\d+\/\d+\/\d+\/\d+ \d+\/\d+ '
+      r'"GET /failoverpath HTTP/1.1"'
+    )
+
     result = fakeHTTPResult(parameter_dict['domain'], '/failoverpath')
     self.assertEqualResultJson(
       result, 'Path', '/failover-url?a=b&c=/failoverpath')
+    self.assertLastLogLineRegexp(
+      '_health-check-failover-url_backend_log',
+      r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d+ '
+      r'\[\d{2}\/.{3}\/\d{4}\:\d{2}\:\d{2}\:\d{2}.\d{3}\] '
+      r'http-backend _health-check-failover-url-http-failover'
+      r'\/_health-check-failover-url-backend '
+      r'\d+/\d+\/\d+\/\d+\/\d+ '
+      r'200 \d+ - - ---- '
+      r'\d+\/\d+\/\d+\/\d+\/\d+ \d+\/\d+ '
+      r'"GET /failoverpath HTTP/1.1"'
+    )
 
   def test_health_check_failover_url_auth_to_backend(self):
     parameter_dict = self.assertSlaveBase(