Merge branches 'master' and 'wip/relay-fixes' into devel

plugins/relay.py

@@ -153,8 +153,8 @@ def loadDB():
     try:
         with open(dbname, "rb") as f:
             db = pickle.load(f)
-    except (ValueError, IOError):
-        log.exception("Relay: failed to load links database %s"
+    except (ValueError, IOError, OSError):
+        log.info("Relay: failed to load links database %s"
                  ", creating a new one in memory...", dbname)
         db = {}
 
@@ -172,7 +172,7 @@ def scheduleExport(starting=False):
     global exportdb_timer
 
     if not starting:
-        # Export the datbase, unless this is being called the first
+        # Export the database, unless this is being called the first
         # thing after start (i.e. DB has just been loaded).
         exportDB()
 
@@ -225,7 +225,6 @@ def getRemoteSid(irc, remoteirc):
             except ValueError:  # Network not initialized yet.
                 log.exception('(%s) Failed to spawn server for %r:',
                               irc.name, remoteirc.name)
-                irc.disconnect()
                 return
             else:
                 irc.servers[sid].remote = remoteirc.name
@@ -1155,6 +1154,7 @@ def handle_disconnect(irc, numeric, command, args):
     """Handles IRC network disconnections (internal hook)."""
     # Quit all of our users' representations on other nets, and remove
     # them from our relay clients index.
+    with spawnlocks[irc.name]:
         for k, v in relayusers.copy().items():
             if irc.name in v:
                 del relayusers[k][irc.name]
@@ -1166,6 +1166,7 @@ def handle_disconnect(irc, numeric, command, args):
                     pass
     # SQUIT all relay pseudoservers spawned for us, and remove them
     # from our relay subservers index.
+    with spawnlocks_servers[irc.name]:
         for name, ircobj in world.networkobjects.copy().items():
             if name != irc.name and ircobj.connected.is_set():
                 try: