3
0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-30 14:49:28 +01:00

relay: drop spawn_servers toggle, remove "Relay network lost connection" quits

Relay server spawning is now always on - there's no real reason why it shouldn't work.

Closes #237.
This commit is contained in:
James Lu 2016-06-25 13:13:59 -07:00
parent 9ea6769c54
commit 1a6bb714ac
3 changed files with 2 additions and 13 deletions

View File

@ -42,7 +42,7 @@ Support for these IRCds exist, but are not tested as frequently and thoroughly.
- Note: for host changing support and optimal functionality, a `service{}` block / U-line should be added for PyLink on every IRCd across your network.
* Nefarious IRCu (2.0.0+) - module `nefarious`
- Note: Both account cloaks (user and oper) and hashed IP cloaks are optionally supported (HOST_HIDING_STYLE settings 0 to 3). Make sure you configure PyLink to match your IRCd settings.
- For optimal functionality (mode overrides in relay, etc.), a `UWorld{}` block / U-line should be added for every server that PyLink spawns. To make this easier, you may want to turn relay's spawn_servers off, so that all relay users originate from one virtual server.
- For optimal functionality (mode overrides in relay, etc.), a `UWorld{}` block / U-line should be added for every server that PyLink spawns.
## Setup

View File

@ -370,10 +370,6 @@ relay:
# both ways by defining "relay_no_ips: true" in their server block.
show_ips: false
# Whether subservers should be spawned for each relay network (requires
# reloading the plugin to change). Defaults to true.
spawn_servers: true
# Determines whether NickServ login info should be shown in the /whois output for
# relay users. This works on most IRCds EXCEPT InspIRCd.
# Valid options include "all" (show this to everyone), "opers" (show only to

View File

@ -235,13 +235,6 @@ def getRemoteSid(irc, remoteirc):
"""Gets the remote server SID representing remoteirc on irc, spawning
it if it doesn't exist."""
try:
spawnservers = irc.conf['relay']['spawn_servers']
except KeyError:
spawnservers = True
if not spawnservers:
return irc.sid
log.debug('(%s) Grabbing spawnlocks_servers[%s]', irc.name, irc.name)
with spawnlocks_servers[irc.name]:
try:
@ -1253,7 +1246,7 @@ def handle_disconnect(irc, numeric, command, args):
if irc.name in v:
del relayusers[k][irc.name]
if k[0] == irc.name:
handle_quit(irc, k[1], 'PYLINK_DISCONNECT', {'text': 'Relay network lost connection.'})
del relayusers[k]
# SQUIT all relay pseudoservers spawned for us, and remove them
# from our relay subservers index.