diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-07-01 09:52:32 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-07-01 09:52:52 -0400 |
| commit | c29ea7c95fee59014e763829d7b461b709161c52 (patch) | |
| tree | 4e974469996ead5233c063a05b7d713fe1f3eac2 | |
| parent | 7e6ede9d0a9ef1d0d2abb87aa361c45c2d3f9911 (diff) | |
| download | bcfg2-maint-1.2.tar.gz bcfg2-maint-1.2.tar.bz2 bcfg2-maint-1.2.zip | |
Metadata: check to ensure address has not been expired before retrieving from cachemaint-1.2
| -rw-r--r-- | src/lib/Server/Plugins/Metadata.py | 9 |
1 files 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: |