remove XMLRPC inheritence that overrode a method no longer in existence
this is probably from python 2 days; we inherited from SimpleXMLRPCRequestHandler to change the logging, but the method overrode no longer exists so this did nothing
This commit is contained in:
parent
c2d26f404e
commit
3aadde4b71
@ -26,14 +26,6 @@ from ircbot.models import Alias, IrcChannel, IrcPlugin, IrcServer
|
|||||||
log = logging.getLogger('ircbot.bot')
|
log = logging.getLogger('ircbot.bot')
|
||||||
|
|
||||||
|
|
||||||
class IrcBotXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
|
|
||||||
"""Override the basic request handler to change the logging."""
|
|
||||||
|
|
||||||
def log_message(self, format, *args):
|
|
||||||
"""Use a logger rather than stderr."""
|
|
||||||
log.debug("XML-RPC - %s - %s", self.client_address[0], format % args)
|
|
||||||
|
|
||||||
|
|
||||||
class PrioritizedRegexHandler(collections.namedtuple('Base', ('priority', 'regex', 'callback'))):
|
class PrioritizedRegexHandler(collections.namedtuple('Base', ('priority', 'regex', 'callback'))):
|
||||||
"""Regex handler that still uses the normal handler priority stuff."""
|
"""Regex handler that still uses the normal handler priority stuff."""
|
||||||
|
|
||||||
@ -414,7 +406,7 @@ class IRCBot(irc.client.SimpleIRCClient):
|
|||||||
|
|
||||||
# load XML-RPC server
|
# load XML-RPC server
|
||||||
self.xmlrpc = SimpleXMLRPCServer((self.server_config.xmlrpc_host, self.server_config.xmlrpc_port),
|
self.xmlrpc = SimpleXMLRPCServer((self.server_config.xmlrpc_host, self.server_config.xmlrpc_port),
|
||||||
requestHandler=IrcBotXMLRPCRequestHandler, allow_none=True)
|
requestHandler=SimpleXMLRPCRequestHandler, allow_none=True)
|
||||||
self.xmlrpc.register_introspection_functions()
|
self.xmlrpc.register_introspection_functions()
|
||||||
|
|
||||||
t = threading.Thread(target=self._xmlrpc_listen, args=())
|
t = threading.Thread(target=self._xmlrpc_listen, args=())
|
||||||
|
Loading…
Reference in New Issue
Block a user