farrokhi/munin-graphite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Gracefully handle lost connections in each thread

Browse Source
This commit is contained in:
Babak Farrokhi 2016-08-30 16:35:53 +04:30
parent 823b6c2636
commit 19660591cb
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
m2g-poller.py
View File

@ -81,25 +81,30 @@ class Munin():
self._sock = socket.create_connection((self.hostname, self.port), 10) self._sock = socket.create_connection((self.hostname, self.port), 10)
self._sock.settimeout(50) self._sock.settimeout(50)
except socket.error: except socket.error:
logger.exception("Thread %s: Unable to connect to Munin host %s, port: %s", logger.info("Thread %s: Unable to connect to Munin host %s, port: %s",
self.thread.name, self.hostname, self.port) self.thread.name, self.hostname, self.port)
sys.exit(1) return False
logger.info("Thread %s: connected to munin", self.thread.name)
try: try:
self._conn = self._sock.makefile() self._conn = self._sock.makefile()
self.hello_string = self._readline() self.hello_string = self._readline()
except socket.error: except socket.error:
logger.exception("Thread %s: Unable to communicate to Munin host %s, port: %s", logger.info("Thread %s: Unable to communicate to Munin host %s, port: %s",
self.thread.name, self.hostname, self.port) self.thread.name, self.hostname, self.port)
self.close_connection()
return False
if self.args.carbon: if self.args.carbon:
self.connect_carbon() self.connect_carbon()
return True
def connect_carbon(self): def connect_carbon(self):
carbon_host, carbon_port = self.args.carbon.split(":") carbon_host, carbon_port = self.args.carbon.split(":")
try: try:
self._carbon_sock = socket.create_connection((carbon_host, carbon_port), 10) self._carbon_sock = socket.create_connection((carbon_host, carbon_port), 10)
except socket.error: except:
logger.exception("Thread %s: Unable to connect to Carbon on host %s, port: %s", logger.exception("Thread %s: Unable to connect to Carbon on host %s, port: %s",
self.thread.name, carbon_host, carbon_port) self.thread.name, carbon_host, carbon_port)
sys.exit(1) sys.exit(1)
@ -126,6 +131,8 @@ class Munin():
break break
if current_line.startswith("#"): if current_line.startswith("#"):
continue continue
if current_line.rstrip().endswith("value"):
continue
if current_line == ".": if current_line == ".":
break break
yield current_line yield current_line
@ -229,13 +236,18 @@ class Munin():
try: try:
self.plugins_config[current_plugin] self.plugins_config[current_plugin]
except KeyError: except KeyError:
try:
self.plugins_config[current_plugin] = self.get_config(current_plugin) self.plugins_config[current_plugin] = self.get_config(current_plugin)
logger.debug("Thread %s: Plugin Config: %s", self.thread.name, self.plugins_config[current_plugin]) logger.debug("Thread %s: Plugin Config: %s", self.thread.name, self.plugins_config[current_plugin])
except:
return time.time()
try: try:
plugin_data = self.fetch(current_plugin) plugin_data = self.fetch(current_plugin)
except: except:
continue logger.info("Thread %s: lost connection in process_host_stats() - sleeping 5 seconds", self.thread.name)
time.sleep(5)
return time.time()
logger.debug("Thread %s: Plugin Data: %s", self.thread.name, plugin_data) logger.debug("Thread %s: Plugin Data: %s", self.thread.name, plugin_data)
if self.args.carbon: if self.args.carbon:
for multigraph in self.plugins_config[current_plugin]: for multigraph in self.plugins_config[current_plugin]: