new info methods

This commit is contained in:
l-n-s
2018-06-11 12:01:39 -04:00
parent b6a2bdf07b
commit 2c4f5c2e9d
2 changed files with 23 additions and 12 deletions

View File

@ -6,19 +6,30 @@ import logging
requests.packages.urllib3.disable_warnings(
requests.packages.urllib3.exceptions.InsecureRequestWarning)
INFO_REQUEST = {
"i2p.router.uptime": "",
"i2p.router.net.status": "",
"i2p.router.netdb.knownpeers": "",
"i2p.router.netdb.activepeers": "",
"i2p.router.net.bw.inbound.1s": "",
"i2p.router.net.bw.outbound.1s": "",
"i2p.router.net.tunnels.participating": "",
"i2p.router.net.tunnels.successrate": "",
"i2p.router.net.total.received.bytes": "",
"i2p.router.net.total.sent.bytes": "",
INFO_METHODS = {
"RouterInfo": {
"i2p.router.uptime": "",
"i2p.router.net.status": "",
"i2p.router.netdb.knownpeers": "",
"i2p.router.netdb.activepeers": "",
"i2p.router.net.bw.inbound.1s": "",
"i2p.router.net.bw.outbound.1s": "",
"i2p.router.net.tunnels.participating": "",
"i2p.router.net.tunnels.successrate": "",
"i2p.router.net.total.received.bytes": "",
"i2p.router.net.total.sent.bytes": "",
},
"ClientServicesInfo": {
"I2PTunnel": "",
"SOCKS": "",
"HTTPProxy": "",
"SAM": "",
"BOB": "",
"I2CP": "",
}
}
STATUS = [
"OK",
"TESTING",

View File

@ -40,7 +40,7 @@ class I2pd(object):
"""Fetch info from i2pcontrol"""
try:
return self.control.request("RouterInfo",
i2pcontrol.INFO_REQUEST)['result']
i2pcontrol.INFO_METHODS["RouterInfo"])['result']
except requests.exceptions.ConnectionError:
return {}