Merge lp:~kelvin.li/rnr-server/charm-supports into lp:rnr-server

[Kelvin Li]

emty revision to trigger rollout

emty revision to trigger rollout

[lp:~kelvin.li/rnr-server/charm-supports]

360. By Kelvin Li on 2015-06-19

changed the rnr.log generate location to fit log sync pattern in metal

[Kelvin Li (kelvin.li)]

In mental staging environment, the rnr.log was generated in /srv/xxx/staging-logs/rnr.log,(changed from revno290[0])
and that doesn't fit the metal sync pattern rules, we lost the rnr.log from 20141105[1]

[0]http://bazaar.launchpad.net/~rnr-developers/rnr-server/trunk/revision/290
[1]@vanadium:/srv/admin.isd.canonical.com/isd-logs/waxapple/reviews/www-logs

[Kelvin Li (kelvin.li)]

Rollout trigger is because we added the BzrRevnoMiddleware[0], which relies on the versioninfo that introduced for juju, it didn't existed in the metal env, we added it into the puppet build step and need to land it.

[0]http://bazaar.launchpad.net/~rnr-developers/rnr-server/trunk/view/head:/src/core/wsgi.py#L43

[Wes Mason (wesmason)]

lgtm

review: Approve

=== modified file 'django_project/settings_base.py'
--- django_project/settings_base.py	2015-06-03 10:06:58 +0000
+++ django_project/settings_base.py	2015-06-19 07:11:11 +0000
@@ -10,6 +10,7 @@
     os.getenv('RNR_LOGS_DIR', os.path.abspath(
         os.path.join(BASE_DIR, os.path.pardir)) + '-logs'))
 OOPS_DIR = os.path.join(LOGS_DIR, 'www-oops')
+APP_LOGS_DIR = os.path.join(LOGS_DIR, 'www-logs')
 
 ABSOLUTE_URL_OVERRIDES = {}
 ADMINS = []
@@ -257,7 +258,7 @@
             'formatter': 'simple',
             'class': 'logging.FileHandler',
             'filters': '',
-            'filename': os.path.join(LOGS_DIR, 'rnr.log'),
+            'filename': os.path.join(APP_LOGS_DIR, 'rnr.log'),
         },
     },
     'incremental': False,