From 20128c69c677b8ebad095bb403a0a66d70b51bda Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Fri, 27 Jun 2014 14:21:36 +0200
Subject: [PATCH] Smaller bug fixes around caching
---
action_plugins/serverdensity.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/action_plugins/serverdensity.py b/action_plugins/serverdensity.py
index 3a6500b..86445db 100644
--- a/action_plugins/serverdensity.py
+++ b/action_plugins/serverdensity.py
@@ -43,7 +43,7 @@ class ActionModule(object):
self.api_token = args.get('api_token')
self.force_update = args.get('force', False)
- self.cache_file_name = args.get('cache', None)
+ self.cache_file_name = args.get('cache', False)
cleanup = args.get('cleanup', False)
just_download = args.get('readonly', False)
@@ -199,7 +199,10 @@ class ActionModule(object):
raise ae('No result from ServerDensity API')
decoder = json.JSONDecoder()
- content = decoder.decode(request_result.content)
+ if request_result.content == '':
+ content = []
+ else:
+ content = decoder.decode(request_result.content)
if request_result.status_code != 200:
msg = content['message']
if content['errors']:
@@ -334,7 +337,7 @@ class ActionModule(object):
self.cache_update(True)
def cache_update(self, force):
- if self.cache_file_name:
+ if self.cache_file_name and self.cache_file_name != 'False':
if force or os.path.exists(self.cache_file_name):
with open(self.cache_file_name, 'w') as cache_file:
cache = {
--
GitLab