From db3151a9dd17a327c559e4cb9596b73a06619534 Mon Sep 17 00:00:00 2001
From: Chris Church <chris@ninemoreminutes.com>
Date: Sat, 10 May 2014 23:57:45 -0400
Subject: [PATCH] Fix for KeyError when cache is empty, change cache key prefix
 for dev vs. prod.

Conflicts:
	awx/settings/production.py
---
 awx/main/models/inventory.py | 2 +-
 awx/settings/defaults.py     | 1 +
 awx/settings/production.py   | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py
index 786fbeb51e..31aab52e12 100644
--- a/awx/main/models/inventory.py
+++ b/awx/main/models/inventory.py
@@ -300,7 +300,7 @@ class Host(CommonModelNameNotUnique):
             if summary_data[key] is None:
                 rebuild_cache = True
                 break
-        if rebuild_cache:
+        if rebuild_cache or not summary_data:
             summary_data = self.update_cached_values()
         summary_data_actual = dict(all_groups=summary_data['%s_all_groups' % self.id],
                                    groups=summary_data['%s_groups' % self.id],
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index cff8ef8f27..4c1376c721 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -229,6 +229,7 @@ CACHES = {
         'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
         'LOCATION': '127.0.0.1:11211',
         'TIMEOUT': 864000,
+        'KEY_PREFIX': 'tower_dev',
     }
 }
 
diff --git a/awx/settings/production.py b/awx/settings/production.py
index 66ea2fb8c4..2f312ba80d 100644
--- a/awx/settings/production.py
+++ b/awx/settings/production.py
@@ -43,6 +43,9 @@ JOBOUTPUT_ROOT = '/var/lib/awx/job_status/'
 # The heartbeat file for the tower scheduler
 SCHEDULE_METADATA_LOCATION = '/var/lib/awx/.tower_cycle'
 
+# Use different cache prefix for production vs. development.
+CACHES['default']['KEY_PREFIX'] = 'tower'
+
 LOGGING['handlers']['rotating_file'] = {
     'level': 'WARNING',
     'class':'logging.handlers.RotatingFileHandler',