Reajust exceptions
lets00 committed
Jan 12, 2018 at 14:40 UTC
4a8fcc30d1ee513313cde93caa25c835ce99118b
1 file changed
+5
-4
python.d/ceph.chart.py
+5
-4
@@ -48,8 +48,6 @@ class Service(SimpleService):
48
self.definitions = CHARTS
49
self.config_file = self.configuration.get('config_file')
50
self.keyring_file = self.configuration.get('keyring_file')
51
- self.cluster = rados.Rados(conffile=self.config_file,
52
- conf=dict(keyring=self.keyring_file))
51
52
def check(self):
53
"""
@@ -63,8 +61,10 @@ class Service(SimpleService):
61
self.error('config_file and/or keyring_file is not defined')
62
return False
63
try:
64
+ self.cluster = rados.Rados(conffile=self.config_file,
65
+ conf=dict(keyring=self.keyring_file))
66
self.cluster.connect()
67
- except Exception as error:
67
+ except rados.Error as error:
68
self.error(error)
69
return False
70
self.create_definitions()
@@ -100,7 +100,8 @@ class Service(SimpleService):
100
data.update(self._get_pool_objects())
101
data.update(self._get_osd_usage())
102
return data
103
- except (ValueError, AttributeError):
103
+ except (ValueError, AttributeError) as error:
104
+ self.error(error)
105
return None
106
107
def _get_general(self):