← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/lp-archive:charm-rsync-gunicorn-logs into lp-archive:main

 

Colin Watson has proposed merging ~cjwatson/lp-archive:charm-rsync-gunicorn-logs into lp-archive:main.

Commit message:
Publish gunicorn logs over rsync

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lp-archive/+git/lp-archive/+merge/438600

layer-ols-wsgi hardcodes gunicorn logs to /var/log/gunicorn.log, so they aren't under the existing rsync module that publishes /srv/lp-archive/logs/.  Add a special module that publishes only /var/log/gunicorn.log* and not other files in that directory.

Compare the nearly-identical https://code.launchpad.net/~cjwatson/lp-signing/+git/lp-signing/+merge/384727.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lp-archive:charm-rsync-gunicorn-logs into lp-archive:main.
diff --git a/charm/lp-archive/templates/lp-archive-rsync.j2 b/charm/lp-archive/templates/lp-archive-rsync.j2
index 52c519d..612ce61 100644
--- a/charm/lp-archive/templates/lp-archive-rsync.j2
+++ b/charm/lp-archive/templates/lp-archive-rsync.j2
@@ -6,3 +6,11 @@
   read only = true
   hosts allow = {{ log_hosts_allow }}
 
+[lp-archive-gunicorn-logs]
+  path = /var/log
+  filter = include /gunicorn.log* exclude /*
+  comment = LP Archive Gunicorn Logs
+  list = false
+  read only = true
+  hosts allow = {{ log_hosts_allow }}
+