Robot/contrib-munin
2
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2018-11-08 00:59:34 +01:00
Code Issues Releases Wiki Activity

Improve log usage

Browse Source 
Migrate to lazy message evaluation
This commit is contained in:
Neraud 2017-07-30 09:38:26 +02:00
parent ac255fa70d
commit f84eee6118
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/torrent/deluge_
View File

@ -158,7 +158,7 @@ class StatClient:
self.connected = False self.connected = False
def end_session(self, msg): def end_session(self, msg):
log.debug("end_session : {0}".format(msg)) log.debug("end_session : %s", msg)
if self.connected: if self.connected:
log.debug("Disconnecting") log.debug("Disconnecting")
@ -167,8 +167,8 @@ class StatClient:
reactor.stop() reactor.stop()
def fetch_info(self): def fetch_info(self):
log.debug("Connecting to {0}:{1} ...".format( log.debug("Connecting to %s:%d ...",
self.conf['host'], self.conf['port'])) self.conf['host'], self.conf['port'])
client.connect( client.connect(
self.conf['host'], self.conf['host'],
self.conf['port'], self.conf['port'],
@ -205,15 +205,13 @@ class StatClient:
errbackArgs=("get_session_state failed")) errbackArgs=("get_session_state failed"))
def on_num_connections(self, num_connections): def on_num_connections(self, num_connections):
log.debug("Got num_connections from the daemon : {0}".format( log.debug("Got num_connections from the daemon : %s", num_connections)
num_connections))
print("{0}.value {1}".format( print("{0}.value {1}".format(
names_for_munin["numConnections"], num_connections)) names_for_munin["numConnections"], num_connections))
self.end_session("Done") self.end_session("Done")
def on_bandwidth(self, values): def on_bandwidth(self, values):
log.debug( log.debug("Got bandwidth info from the daemon : %s", values)
"Got bandwidth info from the daemon : {0}".format(values))
download_rate = values['download_rate'] download_rate = values['download_rate']
payload_download_rate = values['payload_download_rate'] payload_download_rate = values['payload_download_rate']
@ -241,7 +239,7 @@ class StatClient:
deferred_list = [] deferred_list = []
for torrent_id in torrent_ids: for torrent_id in torrent_ids:
log.debug(" - TorrentId : {0}".format(torrent_id)) log.debug(" - TorrentId : %s", torrent_id)
d = client.core.get_torrent_status(torrent_id, ['state']) d = client.core.get_torrent_status(torrent_id, ['state'])
d.addCallback(self.on_one_torrent_info, torrent_id) d.addCallback(self.on_one_torrent_info, torrent_id)
d.addErrback(self.on_one_torrent_info_failed, torrent_id) d.addErrback(self.on_one_torrent_info_failed, torrent_id)
@ -251,21 +249,21 @@ class StatClient:
self.on_all_torrent_info_fetched) self.on_all_torrent_info_fetched)
def on_one_torrent_info_failed(self, torrent_id): def on_one_torrent_info_failed(self, torrent_id):
log.debug("Failed fetching torrent info {0}".format(torrent_id)) log.debug("Failed fetching torrent info %s", torrent_id)
self.state["Error"] = self.state["Error"] + 1 self.state["Error"] = self.state["Error"] + 1
def on_one_torrent_info(self, value, torrent_id): def on_one_torrent_info(self, value, torrent_id):
log.debug("Got torrent info : {0} -> {1}".format(torrent_id, value)) log.debug("Got torrent info : %s -> %s", torrent_id, value)
state = value.get("state", "Error") state = value.get("state", "Error")
if state not in self.states: if state not in self.states:
log.warn("State '{0}' is unknown !".format(state)) log.warn("State '%s' is unknown !", state)
state = "Other" state = "Other"
self.states[state] += 1 self.states[state] += 1
def on_all_torrent_info_fetched(self, res): def on_all_torrent_info_fetched(self, res):
log.debug("on_all_torrent_info_fetched : {0}".format(self.states)) log.debug("on_all_torrent_info_fetched : %s", self.states)
for state in self.states: for state in self.states:
print("{0}.value {1}".format( print("{0}.value {1}".format(
@ -278,11 +276,11 @@ def get_mode():
script_name = os.path.basename(sys.argv[0]) script_name = os.path.basename(sys.argv[0])
mode = script_name[string.rindex(script_name, '_') + 1:] mode = script_name[string.rindex(script_name, '_') + 1:]
log.debug("Mode : {0}".format(mode)) log.debug("Mode : %s", mode)
if mode not in modes: if mode not in modes:
log.error("Unknown mode '{0}'".format(mode)) log.error("Unknown mode '%s'", mode)
log.info("Available modes are : {0}".format(modes)) log.info("Available modes are : %s", modes)
sys.exit(1) sys.exit(1)
return mode return mode
@ -388,7 +386,7 @@ if len(sys.argv) > 1:
plugin_version)) plugin_version))
sys.exit(0) sys.exit(0)
elif action: elif action:
log.warn("Unknown argument '{0}'".format(action)) log.warn("Unknown argument '%s'", action)
sys.exit(1) sys.exit(1)
else: else:
fetch_info(get_mode()) fetch_info(get_mode())