Merge ~hloeung/content-cache-charm:logging into content-cache-charm:master

[Haw Loeung]

Updated so HAProxy also doesn't log if disabled for specific sites

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[James Simpson (jsimpso)]

LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 02c5c69d57f5d9504a93d558f12e52946ba4fa49

diff --git a/lib/haproxy.py b/lib/haproxy.py
index 9f7691c..1dfa3e4 100644
--- a/lib/haproxy.py
+++ b/lib/haproxy.py
@@ -119,6 +119,7 @@ listen {name}
 {indent}capture request header X-Cache-Request-ID len 60
 {redirect_config}{backend_config}{default_backend}"""
         backend_conf = '{indent}use_backend backend-{backend} if {{ hdr(Host) -i {site_name} }}\n'
+        backend_conf_no_logging = '{indent}http-request set-log-level silent if {{ hdr(Host) -i {site_name} }}\n'
         redirect_conf = '{indent}redirect scheme https code 301 if {{ hdr(Host) -i {site_name} }} !{{ ssl_fc }}\n'
 
         rendered_output = []
@@ -153,6 +154,9 @@ listen {name}
                 if tls_path:
                     tls_cert_bundle_paths.append(tls_path)
 
+                if site_conf.get('disable_logging'):
+                    backend_config.append(backend_conf_no_logging.format(site_name=site_name, indent=INDENT))
+
                 # HTTP -> HTTPS redirect
                 if redirect_http_to_https:
                     redirect_config.append(redirect_conf.format(site_name=site_name, indent=INDENT))
diff --git a/reactive/content_cache.py b/reactive/content_cache.py
index 9e7e0ad..910cac8 100644
--- a/reactive/content_cache.py
+++ b/reactive/content_cache.py
@@ -286,6 +286,8 @@ def configure_haproxy():  # NOQA: C901 LP#1825084
         except ValueError as e:
             hookenv.log('Only integer ports are supported: {}'.format(e))
 
+        new_conf[cached_site]['disable_logging'] = site_conf.get('disable-logging')
+
         # XXX: Reduce complexity here
 
         for location, loc_conf in site_conf.get('locations', {}).items():
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output.txt
index a37a6c8..224a2cc 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output.txt
@@ -90,6 +90,7 @@ listen combined-80
     use_backend backend-cached-site6-local if { hdr(Host) -i site6.local }
     use_backend backend-cached-site9-local if { hdr(Host) -i site9.local }
     use_backend backend-cached-site10-local if { hdr(Host) -i site10.local }
+    http-request set-log-level silent if { hdr(Host) -i site11.local }
     use_backend backend-cached-site11-local if { hdr(Host) -i site11.local }
     default_backend backend-cached-site3-local
 
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt
index ed69e91..4e159f5 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt
@@ -90,6 +90,7 @@ listen combined-80
     use_backend backend-cached-site6-local if { hdr(Host) -i site6.local }
     use_backend backend-cached-site9-local if { hdr(Host) -i site9.local }
     use_backend backend-cached-site10-local if { hdr(Host) -i site10.local }
+    http-request set-log-level silent if { hdr(Host) -i site11.local }
     use_backend backend-cached-site11-local if { hdr(Host) -i site11.local }
     default_backend backend-cached-site3-local
 
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt
index b1e58f1..7d96410 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt
@@ -90,6 +90,7 @@ listen combined-80
     use_backend backend-cached-site6-local if { hdr(Host) -i site6.local }
     use_backend backend-cached-site9-local if { hdr(Host) -i site9.local }
     use_backend backend-cached-site10-local if { hdr(Host) -i site10.local }
+    http-request set-log-level silent if { hdr(Host) -i site11.local }
     use_backend backend-cached-site11-local if { hdr(Host) -i site11.local }
     default_backend backend-cached-site3-local
 
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt
index bb18c43..6ea422b 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt
@@ -91,6 +91,7 @@ listen combined-80
     use_backend backend-cached-site6-local if { hdr(Host) -i site6.local }
     use_backend backend-cached-site9-local if { hdr(Host) -i site9.local }
     use_backend backend-cached-site10-local if { hdr(Host) -i site10.local }
+    http-request set-log-level silent if { hdr(Host) -i site11.local }
     use_backend backend-cached-site11-local if { hdr(Host) -i site11.local }
     default_backend backend-cached-site3-local
 
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt
index a788d15..d6b3c48 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt
@@ -90,6 +90,7 @@ listen combined-80
     use_backend backend-cached-site6-local if { hdr(Host) -i site6.local }
     use_backend backend-cached-site9-local if { hdr(Host) -i site9.local }
     use_backend backend-cached-site10-local if { hdr(Host) -i site10.local }
+    http-request set-log-level silent if { hdr(Host) -i site11.local }
     use_backend backend-cached-site11-local if { hdr(Host) -i site11.local }
     default_backend backend-cached-site3-local