Finally fixed that damn EBADF problem - scheduled messages used an expired user object.

Author: minecraft server

plugins/schedule.py

@@ -4,6 +4,8 @@
 DESCRIPTION = """A module for registering a callback to occur at a later time."""
 
 import time
+import logging
+from helpers import InvalidUserError
 
 events = [] # list of (time, key, callback), ordered on time.
 
@@ -52,5 +54,10 @@ def clear(key):
 def on_tick(users):
 	now = time.time()
 	while events and now >= events[0][0]:
-		events[0][1]()
+		try:
+			events[0][1]()
+		except InvalidUserError, ex:
+			logging.info("User %s disconnected before packet could be sent in event: %s" % (ex.args[0], events[0]))
+		except Exception:
+			logging.exception("Error while running event: %s" % (events[0]))
 		events.pop(0)

proxy.py

@@ -48,6 +48,7 @@ def main():
 	import helpers # Hax before import does important hax
 	helpers.active_users = active_users
 	helpers.send_packet = send_packet
+	helpers.InvalidUserError = InvalidUserError
 
 	from plugins import plugins as _plugins # Lazy import prevents circular references
 
@@ -318,7 +319,11 @@ def send_packet(packet, user, to_server):
 	"""Takes packet, user object and whether to send to server (as though from user) or vice versa.
 	Simulates that kind of packet having been recived and passes it on as normal,
 	ie. a packet still goes through the whole list of plugins.
+	Raises InvalidUserError if user no longer exists.
 	"""
+	if user not in user_map.values():
+		raise InvalidUserError(user)
+
 	packets = handle_packet(packet, user, to_server)
 
 	try:
@@ -365,6 +370,10 @@ def __str__(self):
 			return "%s@%s:%s" % ((self.username,) + self.addr)
 
 
+class InvalidUserError(Exception):
+	pass
+
+
 def active_users():
 	"""A hack to allow a "logged in" helper"""
 	global user_map