684400ff9e
Previous logging was very noisy when the agent connection to snmpd drops: [ERROR ] agentx.network - run : Empty PDU, connection closed! [INFO ] agentx.network - disconnect : Disconnecting from localhost:705 [ERROR ] agentx.agent - run : An exception occurred: Empty PDU, disconnecting [ERROR ] agentx.agent - run : Reconnecting [INFO ] agentx.agent - run : Opening AgentX connection [INFO ] agentx.network - connect : Connecting to localhost:705 [ERROR ] agentx.network - connect : Failed to connect to localhost:705 [ERROR ] agentx.agent - run : An exception occurred: Not connected [ERROR ] agentx.agent - run : Reconnecting [INFO ] agentx.agent - run : Opening AgentX connection [INFO ] agentx.network - connect : Connecting to localhost:705 [ERROR ] agentx.network - connect : Failed to connect to localhost:705 [ERROR ] agentx.agent - run : An exception occurred: Not connected [ERROR ] agentx.agent - run : Reconnecting Also, reconnects were attempted every 0.1s, but field research shows that snmpd, if it restarts, takes ~3-5 seconds to come back (note: this is also due to a systemd delay in restarting it upon failures). Hammering the connection is not useful. This change refactors the logging, to avoid redundant messages: - sleep 1s between attempts (reducing the loop by 10x) - Either print 'Connected to' or 'Failed to connect to', not both. - Remove the 'reconnecting' superfluous message
99 lines
2.5 KiB
Python
99 lines
2.5 KiB
Python
#!/usr/bin/env python
|
|
# -*- coding: utf-8 -*-
|
|
from __future__ import (
|
|
absolute_import,
|
|
division,
|
|
print_function,
|
|
)
|
|
|
|
import time
|
|
import logging
|
|
import agentx
|
|
from agentx.dataset import DataSet
|
|
from agentx.network import Network
|
|
|
|
|
|
class NullHandler(logging.Handler):
|
|
def emit(self, record):
|
|
pass
|
|
|
|
|
|
class Agent(object):
|
|
def __init__(self, server_address="/var/agentx/master", period=30.0, args=None):
|
|
self.logger = logging.getLogger("agentx.agent")
|
|
self.logger.addHandler(NullHandler())
|
|
|
|
self._servingset = DataSet()
|
|
self._workingset = DataSet()
|
|
self._lastupdate = 0
|
|
self._update_period = period # Seconds
|
|
|
|
try:
|
|
debug = args.debug_agent
|
|
except:
|
|
debug = False
|
|
self._net = Network(server_address=server_address, debug=debug)
|
|
|
|
self._oid_list = []
|
|
self._args = args
|
|
|
|
def _update(self):
|
|
ds = self.update()
|
|
if not ds:
|
|
return False
|
|
|
|
self._net.update(ds._data)
|
|
self._lastupdate = time.time()
|
|
return True
|
|
|
|
def run(self):
|
|
self.logger.info("Calling setup")
|
|
if not self.setup():
|
|
self.logger.error("Setup failed - exiting")
|
|
return
|
|
|
|
self.logger.info("Initial update")
|
|
self._update()
|
|
|
|
while True:
|
|
if not self._net.is_connected():
|
|
self.logger.info("Opening AgentX connection")
|
|
self._net.start(self._oid_list)
|
|
|
|
if time.time() - self._lastupdate > self._update_period:
|
|
if not self._update():
|
|
self.logger.warning(
|
|
"Update failed, last successful update was %s"
|
|
% self._lastupdate
|
|
)
|
|
time.sleep(1)
|
|
|
|
try:
|
|
self._net.run()
|
|
except Exception as e:
|
|
self.logger.error("Disconnecting due to exception: %s" % e)
|
|
self._net.disconnect()
|
|
time.sleep(1)
|
|
|
|
def stop(self):
|
|
self.logger.debug("Stopping")
|
|
self._net.disconnect()
|
|
pass
|
|
|
|
def setup(self):
|
|
# Override this
|
|
pass
|
|
|
|
def update(self):
|
|
# Override this
|
|
pass
|
|
|
|
def register(self, oid_list):
|
|
if not isinstance(oid_list, list):
|
|
oid_list = [oid_list]
|
|
|
|
for oid in oid_list:
|
|
if not oid in self._oid_list:
|
|
self.logger.debug("Adding %s to list" % oid)
|
|
self._oid_list.append(oid)
|