amal/uncloud
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove double try/except blocks (with wraps)

Browse source
This commit is contained in:
Nico Schottelius 2020-01-10 11:00:00 +01:00
commit 71fd0ca7d9
1 changed files with 9 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

38
uncloud/common/etcd_wrapper.py
View file

@ -61,35 +61,15 @@ class Etcd3Wrapper:
@readable_errors @readable_errors
def get_prefix(self, *args, value_in_json=False, raise_exception=True, **kwargs): def get_prefix(self, *args, value_in_json=False, raise_exception=True, **kwargs):
try: event_iterator = self.client.get_prefix(*args, **kwargs)
event_iterator = self.client.get_prefix(*args, **kwargs) for e in event_iterator:
for e in event_iterator: yield EtcdEntry(*e[::-1], value_in_json=value_in_json)
yield EtcdEntry(*e[::-1], value_in_json=value_in_json)
except etcd3.exceptions.ConnectionFailedError as e:
raise UncloudException("Cannot connect to etcd: {}".format(e))
except Exception as err:
if raise_exception:
raise Exception('Exception in etcd_wrapper.get_prefix') from err
else:
logger.exception('Error in etcd_wrapper')
return iter([])
@readable_errors @readable_errors
def watch_prefix(self, key, raise_exception=True, value_in_json=False): def watch_prefix(self, key, raise_exception=True, value_in_json=False):
try: event_iterator, cancel = self.client.watch_prefix(key)
event_iterator, cancel = self.client.watch_prefix(key) for e in event_iterator:
for e in event_iterator: if hasattr(e, '_event'):
if hasattr(e, '_event'): e = e._event
e = e._event if e.type == e.PUT:
if e.type == e.PUT: yield EtcdEntry(e.kv.key, e.kv.value, value_in_json=value_in_json)
yield EtcdEntry(e.kv.key, e.kv.value, value_in_json=value_in_json)
except Exception as err:
if raise_exception:
raise Exception('Exception in etcd_wrapper.get_prefix') from err
else:
logger.exception('Error in etcd_wrapper.watch_prefix')
try:
cancel()
except Exception:
pass
return iter([])