import 15.2.2 octopus source

[ceph.git] / ceph / src / pybind / mgr / telegraf / module.py

diff --git a/ceph/src/pybind/mgr/telegraf/module.py b/ceph/src/pybind/mgr/telegraf/module.py
index 8283dc0a5b1232a803838b4ec9269daa141210f5..8264fdf32573075afd02c5f0016e03b90cdb651e 100644 (file)
--- a/ceph/src/pybind/mgr/telegraf/module.py
+++ b/ceph/src/pybind/mgr/telegraf/module.py
@@ -240,8 +240,8 @@ class Module(MgrModule):
         sock = BaseSocket(url)
         self.log.debug('Sending data to Telegraf at %s', sock.address)
         now = self.now()
-        with sock as s:
-            try:
+        try:
+            with sock as s:
                 for measurement in self.gather_measurements():
                     self.log.debug(measurement)
                     line = Line(measurement['measurement'],
@@ -249,8 +249,10 @@ class Module(MgrModule):
                                 measurement['tags'], now)
                     self.log.debug(line.to_line_protocol())
                     s.send(line.to_line_protocol())
-            except (socket.error, RuntimeError, IOError, OSError):
-                self.log.exception('Failed to send statistics to Telegraf:')
+        except (socket.error, RuntimeError, IOError, OSError):
+            self.log.exception('Failed to send statistics to Telegraf:')
+        except FileNotFoundError:
+            self.log.exception('Failed to open Telegraf at: %s', url.geturl())
 
     def shutdown(self):
         self.log.info('Stopping Telegraf module')