Merge lp:~barryprice/charms/precise/bip/add_backlog_always_option into lp:charms/bip

Proposed by Barry Price
Status: Merged
Merged at revision: 22
Proposed branch: lp:~barryprice/charms/precise/bip/add_backlog_always_option
Merge into: lp:charms/bip
Diff against target: 47 lines (+7/-1)
3 files modified
config.yaml (+4/-0)
hooks/hooks.py (+2/-0)
templates/bip_conf.template (+1/-1)
To merge this branch: bzr merge lp:~barryprice/charms/precise/bip/add_backlog_always_option
Reviewer Review Type Date Requested Status
Tim Van Steenburgh (community) Approve
Review Queue (community) automated testing Approve
Review via email: mp+245145@code.launchpad.net

Description of the change

Added the ability to set the backlog_always option - defaults to "false".

Previously this was hard-coded to "true", whereas the upstream default setting is "false".

To post a comment you must log in.
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://reports.vapour.ws/charm-tests/charm-bundle-test-10818-results

review: Approve (automated testing)
Revision history for this message
Tim Van Steenburgh (tvansteenburgh) wrote :

+1 LGTM, thanks Barry!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'config.yaml'
--- config.yaml 2014-11-03 07:18:19 +0000
+++ config.yaml 2014-12-18 17:30:51 +0000
@@ -27,6 +27,10 @@
27 type: string27 type: string
28 default: "false"28 default: "false"
29 description: If bip is backlogging just messages and notices, or all topic changes, nick changes etc.29 description: If bip is backlogging just messages and notices, or all topic changes, nick changes etc.
30 backlog_always:
31 type: string
32 default: "false"
33 description: Backlog even lines already backlogged
30 network:34 network:
31 type: string35 type: string
32 default: '{"oftc": {host: "irc.oftc.net", port: 6667}, "freenode": {host: "irc.freenode.net", port: 6667}}'36 default: '{"oftc": {host: "irc.oftc.net", port: 6667}, "freenode": {host: "irc.freenode.net", port: 6667}}'
3337
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py 2014-12-12 05:10:04 +0000
+++ hooks/hooks.py 2014-12-18 17:30:51 +0000
@@ -46,6 +46,7 @@
46user_config = config().get('user')46user_config = config().get('user')
47backlog_lines = config().get('backlog_lines')47backlog_lines = config().get('backlog_lines')
48backlog_msg_only = config().get('backlog_msg_only')48backlog_msg_only = config().get('backlog_msg_only')
49backlog_always = config().get('backlog_always')
49bip_conf = '/etc/bip.conf'50bip_conf = '/etc/bip.conf'
50bip_defaults = '/etc/default/bip'51bip_defaults = '/etc/default/bip'
5152
@@ -91,6 +92,7 @@
91 'user': user,92 'user': user,
92 'backlog_lines': backlog_lines,93 'backlog_lines': backlog_lines,
93 'backlog_msg_only': backlog_msg_only,94 'backlog_msg_only': backlog_msg_only,
95 'backlog_always': backlog_always,
94 }96 }
95 template = template_env.get_template('bip_conf.template').render(templ_vars)97 template = template_env.get_template('bip_conf.template').render(templ_vars)
96 with open(bip_conf, 'w') as bip_conf_config:98 with open(bip_conf, 'w') as bip_conf_config:
9799
=== modified file 'templates/bip_conf.template'
--- templates/bip_conf.template 2014-11-03 07:18:19 +0000
+++ templates/bip_conf.template 2014-12-18 17:30:51 +0000
@@ -15,7 +15,7 @@
15backlog = true;15backlog = true;
16backlog_lines = {{ backlog_lines }};16backlog_lines = {{ backlog_lines }};
17backlog_msg_only = {{ backlog_msg_only }};17backlog_msg_only = {{ backlog_msg_only }};
18backlog_always = true;18backlog_always = {{ backlog_always }};
19blreset_on_talk = false;19blreset_on_talk = false;
2020
21{%for net in network.keys() -%}21{%for net in network.keys() -%}

Subscribers

People subscribed via source and target branches

to all changes: