software/rapid-cdn: Improve frontend HAProxy log parsing

Embrace frontend name in {} and then use such "schema" to catch it during
logging. This lowers the risk of incorrect log file generation or misplaced
log lines.

software/rapid-cdn/buildout.hash.cfg

@@ -38,7 +38,7 @@ md5sum = cba4d995962f7fbeae3f61c9372c4181
 
 [template-frontend-haproxy-configuration]
 _update_hash_filename_ = templates/frontend-haproxy.cfg.in
-md5sum = 2e964dbe75f725c4e45e62720a77bba3
+md5sum = 84576e8b9923e3acfdd52d69e3bf807a
 
 [template-frontend-haproxy-crt-list]
 _update_hash_filename_ = templates/frontend-haproxy-crt-list.in
@@ -106,7 +106,7 @@ md5sum = a9854d48e750b3599043715c95138d5d
 
 [template-frontend-haproxy-rsyslogd-conf]
 _update_hash_filename_ = templates/frontend-haproxy-rsyslogd.conf.in
-md5sum = 420f66264d4cd24070a5a7b325e09ccd
+md5sum = 5b5907dfcac25f62da182024751cac30
 
 [template-backend-haproxy-rsyslogd-conf]
 _update_hash_filename_ = templates/backend-haproxy-rsyslogd.conf.in

software/rapid-cdn/templates/frontend-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 = "^\\\\s*(\\\\S.*)-https{0,1} (.*)" %}
+{%- set regex = "^\\\\s*\\\\{(\\\\S.*)-https{0,1}\\\\} (.*)" %}
 # Extract file name part from 1st match
 template(name="extract_slave_name" type="string" string="%msg:R,ERE,1,FIELD:{{ regex }}--end%")
 set $!slave_name = exec_template("extract_slave_name");

software/rapid-cdn/templates/frontend-haproxy.cfg.in

@@ -58,7 +58,7 @@ defaults
   capture request header REMOTE_USER len 255
   capture request header Referer len 255
   capture request header User-Agent len 255
-  log-format "%{+E}o %b %ci - %[capture.req.hdr(0)] [%trl] \"%HM %HU %HV\" %ST %B \"%[capture.req.hdr(1)]\" \"%[capture.req.hdr(2)]\" %Ta"
+  log-format "%{+E}o {{ '{' }}%b{{ '}' }} %ci - %[capture.req.hdr(0)] [%trl] \"%HM %HU %HV\" %ST %B \"%[capture.req.hdr(1)]\" \"%[capture.req.hdr(2)]\" %Ta"
   # setup Via
   http-request add-header Via "%HV rapid-cdn-frontend-{{ configuration['node-id'] }}-{{ configuration['version-hash'] }}"
   # setup X-Forwarded-For