Merge lp:~brad-marshall/charms/precise/bip/fix-backlog-template into lp:charms/bip

Proposed by Brad Marshall
Status: Merged
Merged at revision: 20
Proposed branch: lp:~brad-marshall/charms/precise/bip/fix-backlog-template
Merge into: lp:charms/bip
Diff against target: 21 lines (+4/-0)
1 file modified
hooks/hooks.py (+4/-0)
To merge this branch: bzr merge lp:~brad-marshall/charms/precise/bip/fix-backlog-template
Reviewer Review Type Date Requested Status
José Antonio Rey (community) Approve
Barry Price Approve
Review via email: mp+244534@code.launchpad.net

Description of the change

Adds in the missing variables for the bip config file for the backlog settings.

To post a comment you must log in.
Revision history for this message
Barry Price (barryprice) :
review: Approve
Revision history for this message
José Antonio Rey (jose) wrote :

+1 LGTM!

Thanks, Brad!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py 2014-03-25 23:23:37 +0000
+++ hooks/hooks.py 2014-12-12 05:12:13 +0000
@@ -44,6 +44,8 @@
44log_format = config().get('log_format')44log_format = config().get('log_format')
45network_config = config().get('network')45network_config = config().get('network')
46user_config = config().get('user')46user_config = config().get('user')
47backlog_lines = config().get('backlog_lines')
48backlog_msg_only = config().get('backlog_msg_only')
47bip_conf = '/etc/bip.conf'49bip_conf = '/etc/bip.conf'
48bip_defaults = '/etc/default/bip'50bip_defaults = '/etc/default/bip'
4951
@@ -87,6 +89,8 @@
87 'log_format': log_format,89 'log_format': log_format,
88 'network': network,90 'network': network,
89 'user': user,91 'user': user,
92 'backlog_lines': backlog_lines,
93 'backlog_msg_only': backlog_msg_only,
90 }94 }
91 template = template_env.get_template('bip_conf.template').render(templ_vars)95 template = template_env.get_template('bip_conf.template').render(templ_vars)
92 with open(bip_conf, 'w') as bip_conf_config:96 with open(bip_conf, 'w') as bip_conf_config:

Subscribers

People subscribed via source and target branches

to all changes: