Merge lp:~michael.nelson/charms/trusty/squid-reverseproxy/add-max-obj-size-mem into lp:charms/trusty/squid-reverseproxy

Proposed by Michael Nelson
Status: Merged
Merged at revision: 56
Proposed branch: lp:~michael.nelson/charms/trusty/squid-reverseproxy/add-max-obj-size-mem
Merge into: lp:charms/trusty/squid-reverseproxy
Diff against target: 26 lines (+5/-0)
2 files modified
config.yaml (+4/-0)
templates/main_config.template (+1/-0)
To merge this branch: bzr merge lp:~michael.nelson/charms/trusty/squid-reverseproxy/add-max-obj-size-mem
Reviewer Review Type Date Requested Status
Charles Butler (community) Approve
Review via email: mp+264664@code.launchpad.net

Commit message

Add max_obj_size_in_mem_kb option. Bug 1474176

Description of the change

Tested locally with:

$ juju ssh sca-cache/0 "sudo cat /etc/squid3/squid.conf | grep maximum_object"
maximum_object_size 8192 KB

$ make manifests/upgrade-deployment
...
########################
# Succesfully verified #
########################
########################
# Nagios Checks Passed #
########################

$ juju ssh sca-cache/0 "sudo cat /etc/squid3/squid.conf | grep maximum_object"
maximum_object_size 8192 KB
maximum_object_size_in_memory 512 KB

To post a comment you must log in.
Revision history for this message
Charles Butler (lazypower) wrote :

+1 LGTM. Thank you for taking the time to submit this fix for the charm store. We appreciate your work. I've merged this branch and it should be available in the charm store after the next ingestion.

If you have any questions/comments/concerns about the review contact us in #juju on irc.freenode.net or email the mailing list <email address hidden>, or ask a question tagged with "juju" on http://askubuntu.com.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2014-05-02 15:23:33 +0000
3+++ config.yaml 2015-07-14 03:05:30 +0000
4@@ -73,6 +73,10 @@
5 type: int
6 default: 8192
7 description: Maximum size of an object to be cached (KB).
8+ max_obj_size_in_mem_kb:
9+ type: int
10+ default: 512
11+ description: Maximum size of an object to be cached in memory (KB).
12 snmp_community:
13 type: string
14 default: ''
15
16=== modified file 'templates/main_config.template'
17--- templates/main_config.template 2015-05-13 04:42:30 +0000
18+++ templates/main_config.template 2015-07-14 03:05:30 +0000
19@@ -35,6 +35,7 @@
20
21 coredump_dir {{ config.cache_dir }}
22 maximum_object_size {{ config.max_obj_size_kb }} KB
23+maximum_object_size_in_memory {{ config.max_obj_size_in_mem_kb }} KB
24
25 {% if config.cache_size_mb > 0 -%}
26 cache_dir aufs {{ config.cache_dir }} {{ config.cache_size_mb }} {{ config.cache_l1 }} {{ config.cache_l2 }}

Subscribers

People subscribed via source and target branches

to all changes: