3
0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-27 21:19:31 +01:00

servermaps: display hopcount in 'map' for local servers

This commit is contained in:
James Lu 2017-09-23 22:36:49 -07:00
parent ad32ce20da
commit 8443de4701

View File

@ -52,8 +52,8 @@ def _map(irc, source, args, show_relay=True):
if hops == 0: if hops == 0:
# Show our root server once. # Show our root server once.
rootusers = len(serverlist[sid].users) rootusers = len(serverlist[sid].users)
reply('\x02%s\x02[%s]: %s user(s) (%s%%)' % (serverlist[sid].name, sid, reply('\x02%s\x02[%s]: %s user(s) (%s%%) {hopcount: %d}' % (serverlist[sid].name, sid,
rootusers, _percent(rootusers, usercount))) rootusers, _percent(rootusers, usercount), serverlist[sid].hopcount))
log.debug('(%s) servermaps: servers under sid %s: %s', irc.name, sid, servers) log.debug('(%s) servermaps: servers under sid %s: %s', irc.name, sid, servers)
@ -68,10 +68,12 @@ def _map(irc, source, args, show_relay=True):
serverusers = len(serverlist[leaf].users) serverusers = len(serverlist[leaf].users)
if is_relay_server: if is_relay_server:
# Skip showing user data for relay servers. # Skip showing user data for relay servers.
reply("%s\x02%s\x02[%s] (via PyLink Relay)" % (' '*hops, serverlist[leaf].name, leaf)) reply("%s\x02%s\x02[%s] (via PyLink Relay)" %
(' '*hops, serverlist[leaf].name, leaf))
else: else:
reply("%s\x02%s\x02[%s]: %s user(s) (%s%%)" % (' '*hops, serverlist[leaf].name, leaf, reply("%s\x02%s\x02[%s]: %s user(s) (%s%%) {hopcount: %d}" %
serverusers, _percent(serverusers, usercount))) (' '*hops, serverlist[leaf].name, leaf,
serverusers, _percent(serverusers, usercount), serverlist[leaf].hopcount))
showall(ircobj, leaf, hops, is_relay_server=is_relay_server) showall(ircobj, leaf, hops, is_relay_server=is_relay_server)
if (not is_relay_server) and hasattr(serverlist[leaf], 'remote') and show_relay: if (not is_relay_server) and hasattr(serverlist[leaf], 'remote') and show_relay: