lp-archive

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

  1. Git
  2. lp:~cjwatson/lp-archive
  3. charm-rsync-gunicorn-logs
  4. Merge into main
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: b225713b16e850cb9896cf32278524096fd3f94d
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/lp-archive:charm-rsync-gunicorn-logs
Merge into: lp-archive:main
Diff against target: 16 lines (+8/-0)
1 file modified
charm/lp-archive/templates/lp-archive-rsync.j2 (+8/-0)
Reviewer Review Type Date Requested Status
Guruprasad Approve
Review via email: mp+438600@code.launchpad.net

Commit message

Publish gunicorn logs over rsync

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Guruprasad (lgp171188) wrote :

LGTM 👍🏼

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/lp-archive/templates/lp-archive-rsync.j2 b/charm/lp-archive/templates/lp-archive-rsync.j2
2index 52c519d..612ce61 100644
3--- a/charm/lp-archive/templates/lp-archive-rsync.j2
4+++ b/charm/lp-archive/templates/lp-archive-rsync.j2
5@@ -6,3 +6,11 @@
6 read only = true
7 hosts allow = {{ log_hosts_allow }}
8
9+[lp-archive-gunicorn-logs]
10+ path = /var/log
11+ filter = include /gunicorn.log* exclude /*
12+ comment = LP Archive Gunicorn Logs
13+ list = false
14+ read only = true
15+ hosts allow = {{ log_hosts_allow }}
16+

Subscribers

People subscribed via source and target branches