software/erp5: include timestamp in haproxy error log

Haproxy log errors for events like when all backends from a family fail the
health check, it is helpful for investigations to have a timestamp in this log.

We were using ActionFileDefaultTemplate so that access logs use standard
"combined"-like format, we change so that this apply only to the access log,
so that error log have the default "timestamp hostname process[pid] message"
format.

software/erp5/test/test/test_balancer.py

@@ -197,14 +197,14 @@ class SlowHTTPServer(ManagedHTTPServer):
     log_message = logging.getLogger(__name__ + '.SlowHandler').info
 
 
-class TestAccessLog(BalancerTestCase, CrontabMixin):
-  """Check access logs emitted by balancer
+class TestLog(BalancerTestCase, CrontabMixin):
+  """Check logs emitted by balancer
   """
   __partition_reference__ = 'l'
   @classmethod
   def _getInstanceParameterDict(cls):
     # type: () -> Dict
-    parameter_dict = super(TestAccessLog, cls)._getInstanceParameterDict()
+    parameter_dict = super(TestLog, cls)._getInstanceParameterDict()
     # use a slow server instead
     parameter_dict['dummy_http_server'] = [[cls.getManagedResource("slow_web_server", SlowHTTPServer).netloc, 1, False]]
     return parameter_dict
@@ -284,6 +284,22 @@ class TestAccessLog(BalancerTestCase, CrontabMixin):
     self.assertTrue(os.path.exists(rotated_log_file + '.xz'))
     self.assertFalse(os.path.exists(rotated_log_file))
 
+  def test_error_log(self):
+    # stop backend server
+    backend_server = self.getManagedResource("slow_web_server", SlowHTTPServer)
+    self.addCleanup(backend_server.open)
+    backend_server.close()
+    # after a while, balancer should detect and log this event in error log
+    time.sleep(5)
+    self.assertEqual(
+        requests.get(self.default_balancer_url, verify=False).status_code,
+        requests.codes.service_unavailable)
+    with open(os.path.join(self.computer_partition_root_path, 'var', 'log', 'apache-error.log')) as error_log_file:
+      error_line = error_log_file.read().splitlines()[-1]
+    self.assertIn('proxy family_default has no server available!', error_line)
+    # this log also include a timestamp
+    self.assertRegexpMatches(error_line, r'\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}')
+
 
 class BalancerCookieHTTPServer(ManagedHTTPServer):
   """An HTTP Server which can set balancer cookie.

stack/erp5/buildout.hash.cfg

@@ -94,4 +94,4 @@ md5sum = 452c502fabd5a6066c9dee533dfb1c77
 
 [template-rsyslogd-cfg]
 filename = rsyslogd.cfg.in
-md5sum = 7030e42b50e03f24e036b7785bd6159f
+md5sum = c34a9ee48b875148ea3f0d82cf853810

stack/erp5/rsyslogd.cfg.in

@@ -7,7 +7,6 @@ module(
 # Also cut out first empty space in msg, which is related to rsyslogd
 # internal and end up cutting on 8k, as it's default of $MaxMessageSize
 template(name="rawoutput" type="string" string="%msg:2:8192%\n")
-$ActionFileDefaultTemplate rawoutput
 
 $FileCreateMode 0600
 $DirCreateMode 0700
@@ -15,5 +14,5 @@ $Umask 0022
 
 $WorkDirectory {{ parameter_dict['spool-directory'] }}
 
-local0.=info {{ parameter_dict['access-log-file'] }}
+local0.=info {{ parameter_dict['access-log-file'] }};rawoutput
 local0.warning {{ parameter_dict['error-log-file'] }}