Merge lp:~abentley/charms/precise/juju-reports/new-script-logging into lp:~juju-qa/charms/precise/juju-reports/trunk

[Aaron Bentley]

Support new script logging.

This branch supports the new script logging by
1. accepting error-email-from.
2. propagating error-email-from and error-email into production.ini.
3. refusing to install the crontab until these are set.
4. Updating the crontab to use the --email-logs and --log-file options.

As a driveby, used the get-s3-ci-results script instead of using python to run its module, jujureports.jobs.releases.

[Curtis Hovey (sinzui)]

This is fine to merge after lp:~abentley/juju-reports/logging-fixes is merged.

review: Approve (code)

=== modified file 'config.yaml'
--- config.yaml	2014-08-08 18:55:10 +0000
+++ config.yaml	2014-08-20 17:06:15 +0000
@@ -16,6 +16,10 @@
     type: string
     default: ""
     description: "Address to mail errors to."
+  error-email-from:
+    type: string
+    default: ""
+    description: "Address to mail errors from."
   lp-key:
     type: string
     default: ""

=== modified file 'hooks/common.py'
--- hooks/common.py	2014-08-14 16:48:49 +0000
+++ hooks/common.py	2014-08-20 17:06:15 +0000
@@ -34,7 +34,8 @@
     return os.path.join(PROJECT_DIR, 'resources/{}.template'.format(name))
 
 
-def install_ini(mongo_url, gh_token, jujuci_url, token):
+def install_ini(mongo_url, gh_token, jujuci_url, token, error_email,
+                error_email_from):
     config = ConfigParser()
     path = get_template_path(INI)
     if not os.path.exists(path):
@@ -45,6 +46,8 @@
     config.set('app:main', 'jujuci.url', jujuci_url)
     config.set('app:main', 'charm_bundle_test_token', token)
     config.set('app:main', 'home', HOME)
+    config.set('app:main', 'error_email', error_email)
+    config.set('app:main', 'error_email_from', error_email_from)
     config.write(open(get_ini_path(), 'w'))
     return config
 
@@ -272,10 +275,13 @@
         hookenv.log('No mongodb set up.')
         return
     ini = install_ini(mongo_url, config['gh-token'], config['jujuci-url'],
-                      config['charm-bundle-test-token'])
+                      config['charm-bundle-test-token'],
+                      config['error-email'], ['error-email-from'])
     configure_s3(config)
-    unset = [key for key in ['lp-key', 'lp-oauth', 'gh-token',
-             'charm-bundle-test-token'] if config[key] == '']
+    unset = [key for key in [
+        'lp-key', 'lp-oauth', 'gh-token', 'charm-bundle-test-token',
+        'error-email', 'error-email-from'
+    ] if config[key] == '']
     if len(unset) > 0:
         hookenv.log('Not setting up cron because {} not set.'.format(
             ', '.join(unset)))

=== modified file 'templates/crontab.tmpl'
--- templates/crontab.tmpl	2014-08-15 19:47:25 +0000
+++ templates/crontab.tmpl	2014-08-20 17:06:15 +0000
@@ -2,9 +2,9 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 $error_email
 
-* * * * * ubuntu INI=$reports_home/production.ini $reports_home/bin/cbtest > /dev/null && INI=$reports_home/production.ini $reports_home/bin/store-trigger > /dev/null 2> /dev/null
+* * * * * ubuntu INI=$reports_home/production.ini $reports_home/bin/cbtest --email-logs --log-file $reports_home/cbtest.log && INI=$reports_home/production.ini $reports_home/bin/store-trigger --email-logs --log-file $reports_home/store-trigger.log
 */$interval * * * * ubuntu INI=$reports_home/production.ini $reports_home/bin/python $reports_home/jujureports/jobs/jujuci.py
-*/$interval * * * * ubuntu INI=$reports_home/production.ini $reports_home/bin/python $reports_home/jujureports/jobs/releases.py
+*/$interval * * * * ubuntu INI=$reports_home/production.ini $reports_home/bin/get-s3-ci-results --email-logs --log-file $reports_home/get-s3-ci-results.log
 # */$interval * * * * ubuntu INI=$reports_home/production.ini $reports_home/bin/python $reports_home/jujureports/jobs/charm_testing.py
 # The weekday below should match the value scorecard.collection_day
 # in the file production.ini in lp:juju-reports.