From c29ea7c95fee59014e763829d7b461b709161c52 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 1 Jul 2013 09:52:32 -0400 Subject: Metadata: check to ensure address has not been expired before retrieving from cache --- src/lib/Server/Plugins/Metadata.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py index 4abcf8e4e..3f8da70cc 100644 --- a/src/lib/Server/Plugins/Metadata.py +++ b/src/lib/Server/Plugins/Metadata.py @@ -594,10 +594,11 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, (stamp, _) = self.session_cache[addrpair] if curtime - stamp > cache_ttl: del self.session_cache[addrpair] - # return the cached data - (stamp, uuid) = self.session_cache[addresspair] - if time.time() - stamp < cache_ttl: - return self.session_cache[addresspair][1] + if addresspair in self.session_cache: + # return the cached data + (stamp, uuid) = self.session_cache[addresspair] + if time.time() - stamp < cache_ttl: + return self.session_cache[addresspair][1] address = addresspair[0] if address in self.addresses: if len(self.addresses[address]) != 1: -- cgit v1.2.3-1-g7c22