Changeset d846cbe

Timestamp:

Mar 12, 2014 6:09:53 PM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

ba07149

Parents:

4cf0198

Message:

Make error handling clearer

File:

• fedd/federation/access.py (modified) (1 diff)

fedd/federation/access.py

@@ -745 +745 @@
                 store = p.get('store', None)
 
-                if name and key and store :
-                    req = { 'name': key, 'wait': True }
-                    self.log.debug("Waiting for %s (%s) from %s" % \
-                            (name, key, store))
-                    r = self.call_GetValue(store, req, cf)
-                    r = r.get('GetValueResponseBody', None)
-                    if r :
-                        if r.get('name', '') == key:
-                            v = r.get('value', None)
-                            if v is not None:
-                                if name == 'peer':
-                                    self.log.debug("Got peer %s" % v)
-                                    c['peer'] = v
-                                else:
-                                    self.log.debug("Got %s %s" % (name, v))
-                                    if c.has_key('fedAttr'):
-                                        c['fedAttr'].append({
-                                            'attribute': name, 'value': v})
-                                    else:
-                                        c['fedAttr']= [{
-                                            'attribute': name, 'value': v}]
-                            else:
-                                raise service_error(service_error.internal, 
-                                        'None value exported for %s'  % key)
-                        else:
-                            raise service_error(service_error.internal, 
-                                    'Different name returned for %s: %s' \
-                                            % (key, r.get('name','')))
-                    else:
-                        raise service_error(service_error.internal, 
-                            'Badly formatted response: no GetValueResponseBody')
-                else:
+                if not all((name, key, store)):
                     raise service_error(service_error.internal, 
                         'Bad Services missing info for import %s' % c)
+
+                req = { 'name': key, 'wait': True }
+                self.log.debug("Waiting for %s (%s) from %s" % \
+                        (name, key, store))
+                r = self.call_GetValue(store, req, cf)
+                r = r.get('GetValueResponseBody', None)
+                if r is None:
+                    raise service_error(service_error.internal,
+                        'Badly formatted response: no GetValueResponseBody')
+                if r.get('name', '') != key:
+                    raise service_error(service_error.internal,
+                            'Different name returned for %s: %s' \
+                                    % (key, r.get('name','')))
+                v = r.get('value', None)
+                if v is None:
+                    raise service_error(service_error.internal,
+                            'None value exported for %s'  % key)
+                if name == 'peer':
+                    self.log.debug("Got peer %s" % v)
+                    c['peer'] = v
+                else:
+                    self.log.debug("Got %s %s" % (name, v))
+                    if c.has_key('fedAttr'):
+                        c['fedAttr'].append({
+                            'attribute': name, 'value': v})
+                    else:
+                        c['fedAttr']= [{
+                            'attribute': name, 'value': v}]
 
     def remove_dirs(self, dir):