Ubuntu Mirror Charm

Merge ~jsimpso/ubuntu-mirror-charm:xinetd_logging into ubuntu-mirror-charm:master

  1. Git
  2. lp:~jsimpso/ubuntu-mirror-charm
  3. xinetd_logging
  4. Merge into master
Proposed by James Simpson
Status: Merged
Approved by: James Simpson
Approved revision: 18857152aa5c88d9b8ea2ac12557d5f26a871662
Merged at revision: dd1af316fac2d4f8f0806dc1252e49b29508cd60
Proposed branch: ~jsimpso/ubuntu-mirror-charm:xinetd_logging
Merge into: ubuntu-mirror-charm:master
Diff against target: 24 lines (+2/-2)
2 files modified
templates/rsync-xinetd.tmpl (+1/-1)
tests/unit/test_charm.py (+1/-1)
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+427796@code.launchpad.net

Commit message

xinetd: log PID on successful connections

To post a comment you must log in.
Revision history for this message
Haw Loeung (hloeung) wrote :

LGTM

review: Approve (+1)
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

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

Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision dd1af316fac2d4f8f0806dc1252e49b29508cd60

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/templates/rsync-xinetd.tmpl b/templates/rsync-xinetd.tmpl
2index f0ff483..4cc0175 100644
3--- a/templates/rsync-xinetd.tmpl
4+++ b/templates/rsync-xinetd.tmpl
5@@ -11,5 +11,5 @@ service rsync
6 per_source = ${max_connections_per_source}
7 log_type = SYSLOG daemon info
8 log_on_failure = HOST ATTEMPT
9- log_on_success = HOST DURATION
10+ log_on_success = HOST DURATION PID
11 }
12diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
13index ba0e688..69cd7c0 100644
14--- a/tests/unit/test_charm.py
15+++ b/tests/unit/test_charm.py
16@@ -402,7 +402,7 @@ WantedBy=sockets.target
17 per_source = 5
18 log_type = SYSLOG daemon info
19 log_on_failure = HOST ATTEMPT
20- log_on_success = HOST DURATION
21+ log_on_success = HOST DURATION PID
22 }
23 """, perms=0o444)
24 _check_call.any_call(['systemctl', 'stop', 'rsyncd.socket'])

Subscribers

People subscribed via source and target branches