Merge ~cjwatson/txpkgupload:fix-systemd-socket-activation into txpkgupload:master
Proposed by
Colin Watson
Status: | Merged |
---|---|
Approved by: | Colin Watson |
Approved revision: | fab943402b1f88cf01458116d870891aff7586e7 |
Merge reported by: | Otto Co-Pilot |
Merged at revision: | not available |
Proposed branch: | ~cjwatson/txpkgupload:fix-systemd-socket-activation |
Merge into: | txpkgupload:master |
Diff against target: |
132 lines (+25/-14) 7 files modified
charm/txpkgupload/charmcraft.yaml (+1/-1) charm/txpkgupload/templates/txpkgupload.service.j2 (+1/-0) charm/txpkgupload/templates/txpkgupload.socket.j2 (+4/-2) charm/txpkgupload/templates/txpkgupload_config.yaml.j2 (+2/-2) src/txpkgupload/plugin.py (+4/-2) src/txpkgupload/tests/test_plugin.py (+9/-6) src/txpkgupload/twistedftp.py (+4/-1) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Simone Pelosi | Approve | ||
Review via email: mp+450808@code.launchpad.net |
Commit message
Fix systemd socket activation
Description of the change
We noticed that the application didn't start up in the new charmed deployment on qastaging. I found that this was because socket activation wasn't set up quite right.
To post a comment you must log in.
Lgtm!