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

[Brad Crittenden]

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

[Richard Harding (rharding)]

LGTM

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-01-02 14:19:13 +0000
+++ config.yaml	2014-01-07 18:40:46 +0000
@@ -9,7 +9,7 @@
     description: "The amount of time (in minutes) that scripts should hold locks."
   worker-interval:
     type: int
-    default: 1
+    default: 900
     description: "The amount of time (in seconds) that the worker should wait before looking for new jobs."
   source:
     type: string
@@ -31,7 +31,7 @@
       A string that will be prepended to instance name to set the host name
       in nagios. So for instance the hostname would be something like:
           juju-myservice-0
-      If you're running multiple environments with the same services in them
+      If you are running multiple environments with the same services in them
       this allows you to differentiate between them.
   charm_import_limit:
       default: 110

=== modified file 'production_overrides.ini'
--- production_overrides.ini	2013-11-13 21:34:38 +0000
+++ production_overrides.ini	2014-01-07 18:40:46 +0000
@@ -55,7 +55,7 @@
 propagate = 0
 
 [handler_error_file]
-# We want to suppress gunicorn logging because it write three copies. We must
+# We want to suppress gunicorn logging because it writes three copies. We must
 # also have a log file handler for /home/charmworld/var/app-exception.log or
 # else exceptions don't get logged.  So we define this handler while ensuring
 # it doesn't log anything.