Content Cache Charm

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

  1. Git
  2. lp:~hloeung/content-cache-charm
  3. master
  4. Merge into master
Proposed by Haw Loeung
Status: Merged
Approved by: Barry Price
Approved revision: 1079f1645adc4fb75bc16c74b721a31425ba675b
Merged at revision: 0b6384d00ec8fdc66e8e12b38d6d6e61020763f8
Proposed branch: ~hloeung/content-cache-charm:master
Merge into: content-cache-charm:master
Diff against target: 90 lines (+24/-0)
6 files modified
templates/haproxy_cfg.tmpl (+4/-0)
tests/unit/files/content_cache_rendered_haproxy_test_output.txt (+4/-0)
tests/unit/files/content_cache_rendered_haproxy_test_output2.txt (+4/-0)
tests/unit/files/content_cache_rendered_haproxy_test_output3.txt (+4/-0)
tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt (+4/-0)
tests/unit/files/haproxy_config_rendered_test_output.txt (+4/-0)
Reviewer Review Type Date Requested Status
Barry Price Approve
Canonical IS Reviewers Pending
Review via email: mp+382981@code.launchpad.net

Commit message

Work around lingering HAProxy processes - LP:1874386

To post a comment you must log in.
Revision history for this message
Barry Price (barryprice) wrote :

+1

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (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 Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 0b6384d00ec8fdc66e8e12b38d6d6e61020763f8

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/templates/haproxy_cfg.tmpl b/templates/haproxy_cfg.tmpl
2index c4f36cd..435b6bb 100644
3--- a/templates/haproxy_cfg.tmpl
4+++ b/templates/haproxy_cfg.tmpl
5@@ -10,6 +10,10 @@ global
6 group haproxy
7 daemon
8
9+ # LP#1874386: Work around lingering HAProxy processes as per LP:1874386
10+ # and kill them off after 15mins.
11+ hard-stop-after 15m
12+
13 # Default SSL material locations
14 ca-base /etc/ssl/certs
15 crt-base /etc/ssl/private
16diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output.txt
17index 81f5fab..41e3559 100644
18--- a/tests/unit/files/content_cache_rendered_haproxy_test_output.txt
19+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output.txt
20@@ -10,6 +10,10 @@ global
21 group haproxy
22 daemon
23
24+ # LP#1874386: Work around lingering HAProxy processes as per LP:1874386
25+ # and kill them off after 15mins.
26+ hard-stop-after 15m
27+
28 # Default SSL material locations
29 ca-base /etc/ssl/certs
30 crt-base /etc/ssl/private
31diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt
32index 7cf9795..ca59e11 100644
33--- a/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt
34+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt
35@@ -10,6 +10,10 @@ global
36 group haproxy
37 daemon
38
39+ # LP#1874386: Work around lingering HAProxy processes as per LP:1874386
40+ # and kill them off after 15mins.
41+ hard-stop-after 15m
42+
43 # Default SSL material locations
44 ca-base /etc/ssl/certs
45 crt-base /etc/ssl/private
46diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt
47index 925f62c..2e1bc57 100644
48--- a/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt
49+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt
50@@ -10,6 +10,10 @@ global
51 group haproxy
52 daemon
53
54+ # LP#1874386: Work around lingering HAProxy processes as per LP:1874386
55+ # and kill them off after 15mins.
56+ hard-stop-after 15m
57+
58 # Default SSL material locations
59 ca-base /etc/ssl/certs
60 crt-base /etc/ssl/private
61diff --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
62index 4a1fb68..7856924 100644
63--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt
64+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt
65@@ -10,6 +10,10 @@ global
66 group haproxy
67 daemon
68
69+ # LP#1874386: Work around lingering HAProxy processes as per LP:1874386
70+ # and kill them off after 15mins.
71+ hard-stop-after 15m
72+
73 # Default SSL material locations
74 ca-base /etc/ssl/certs
75 crt-base /etc/ssl/private
76diff --git a/tests/unit/files/haproxy_config_rendered_test_output.txt b/tests/unit/files/haproxy_config_rendered_test_output.txt
77index 142765d..6956098 100644
78--- a/tests/unit/files/haproxy_config_rendered_test_output.txt
79+++ b/tests/unit/files/haproxy_config_rendered_test_output.txt
80@@ -10,6 +10,10 @@ global
81 group haproxy
82 daemon
83
84+ # LP#1874386: Work around lingering HAProxy processes as per LP:1874386
85+ # and kill them off after 15mins.
86+ hard-stop-after 15m
87+
88 # Default SSL material locations
89 ca-base /etc/ssl/certs
90 crt-base /etc/ssl/private

Subscribers

People subscribed via source and target branches