Merge lp:~bac/charms/precise/charmworld/fix-logging into lp:~juju-jitsu/charms/precise/charmworld/trunk

Proposed by Brad Crittenden
Status: Merged
Approved by: Brad Crittenden
Approved revision: 88
Merged at revision: 88
Proposed branch: lp:~bac/charms/precise/charmworld/fix-logging
Merge into: lp:~juju-jitsu/charms/precise/charmworld/trunk
Diff against target: 34 lines (+3/-3)
2 files modified
config.yaml (+2/-2)
production_overrides.ini (+1/-1)
To merge this branch: bzr merge lp:~bac/charms/precise/charmworld/fix-logging
Reviewer Review Type Date Requested Status
Richard Harding Approve
Review via email: mp+200714@code.launchpad.net

Description of the change

Set worker-interval to a sane value.
Fix some typos.

To post a comment you must log in.
Revision history for this message
Richard Harding (rharding) wrote :

LGTM

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-01-02 14:19:13 +0000
3+++ config.yaml 2014-01-07 18:40:46 +0000
4@@ -9,7 +9,7 @@
5 description: "The amount of time (in minutes) that scripts should hold locks."
6 worker-interval:
7 type: int
8- default: 1
9+ default: 900
10 description: "The amount of time (in seconds) that the worker should wait before looking for new jobs."
11 source:
12 type: string
13@@ -31,7 +31,7 @@
14 A string that will be prepended to instance name to set the host name
15 in nagios. So for instance the hostname would be something like:
16 juju-myservice-0
17- If you're running multiple environments with the same services in them
18+ If you are running multiple environments with the same services in them
19 this allows you to differentiate between them.
20 charm_import_limit:
21 default: 110
22
23=== modified file 'production_overrides.ini'
24--- production_overrides.ini 2013-11-13 21:34:38 +0000
25+++ production_overrides.ini 2014-01-07 18:40:46 +0000
26@@ -55,7 +55,7 @@
27 propagate = 0
28
29 [handler_error_file]
30-# We want to suppress gunicorn logging because it write three copies. We must
31+# We want to suppress gunicorn logging because it writes three copies. We must
32 # also have a log file handler for /home/charmworld/var/app-exception.log or
33 # else exceptions don't get logged. So we define this handler while ensuring
34 # it doesn't log anything.

Subscribers

People subscribed via source and target branches

to all changes: