Juju Charms Collection
apache2 package

Merge lp:~ahasenack/charms/precise/apache2/apache2-no-failing-juju-log into lp:charms/apache2

  1. Precise Pangolin (12.04)
  2. apache2-no-failing-juju-log
  3. Merge into trunk
Proposed by Andreas Hasenack
Status: Merged
Merged at revision: 48
Proposed branch: lp:~ahasenack/charms/precise/apache2/apache2-no-failing-juju-log
Merge into: lp:charms/apache2
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/hooks.py (+1/-1)
To merge this branch: bzr merge lp:~ahasenack/charms/precise/apache2/apache2-no-failing-juju-log
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Review via email: mp+194403@code.launchpad.net

Commit message

Don't log all the config and relation data pieces as it can be quite a lot and overflow the command line size limit.

Description of the change

Don't log all the config and relation data pieces as it can be quite a lot and overflow the command line size limit.

To post a comment you must log in.
Revision history for this message
Tom Haddon (mthaddon) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/hooks.py'
2--- hooks/hooks.py 2013-10-23 19:21:57 +0000
3+++ hooks/hooks.py 2013-11-07 18:54:03 +0000
4@@ -395,7 +395,7 @@
5 from jinja2 import Template
6 template = Template(
7 str(base64.b64decode(config_data[template_var])))
8- log("Writing file: %s with data: %s" % (vhost_file, template_data))
9+ log("Writing file %s with config and relation data" % vhost_file)
10 with open(vhost_file, 'w') as vhost:
11 vhost.write(str(template.render(template_data)))
12 open_port(ports[proto])

Subscribers

People subscribed via source and target branches