--- a/fixbot/api.py Thu Feb 04 19:54:49 2010 +0200
+++ b/fixbot/api.py Thu Feb 04 20:10:34 2010 +0200
@@ -14,17 +14,14 @@
# module's name
name = None
- # module's version, as a 16-bit integer
- version = None
-
# list of valid event types (strings)
event_types = None
def __str__ (self) :
- return "Module %s:%d" % (self.name, self.version)
+ return "Module %s:" % (self.name)
def __repr__ (self) :
- return "<module %s:%d with events: %s>" % (self.name, self.version, ", ".join(self.event_types))
+ return "<module %s with events: %s>" % (self.name, ", ".join(self.event_types))
class Event (object) :
# the ModuleInfo object
@@ -102,13 +99,9 @@
m = ModuleInfo()
m.name = i.readVarLen('B')
- m.version = i.readItem('H')
-
m.event_types = list(buffer.readStringStream(i, 'B'))
m.addr = self.transport.getPeer()
- self.module_name = m.name
-
log.msg("Got mod_init for %r" % m)
self.factory.nexus.registerModule(m, self)
@@ -127,8 +120,6 @@
e = Event(self.module, event_type, event_msg)
-# log.msg("Got mod_event of %r" % (e))
-
self.factory.nexus.handleEvent(e)
def logPrefix (self) :
@@ -147,7 +138,6 @@
o = self.startCommand('module_init')
o.writeVarLen('B', self.factory.secret)
o.writeVarLen('B', self.factory.name)
- o.writeItem("H", self.factory.version)
buffer.writeStringStream(o, 'B', self.factory.event_types)
self.send(o)
@@ -165,7 +155,7 @@
self.factory.connected(self)
def logPrefix (self) :
- return "module %s:%d client" % (self.factory.name, self.factory.version)
+ return "module %s client" % (self.factory.name)
class Module (ModuleInfo, protocol.ClientFactory) :
protocol = ClientProtocol
--- a/fixbot/irc.py Thu Feb 04 19:54:49 2010 +0200
+++ b/fixbot/irc.py Thu Feb 04 20:10:34 2010 +0200
@@ -59,7 +59,7 @@
self.send("[%s.%s] %s" % (event.module.name, event.type, event.msg))
def moduleConnected (self, module, addr) :
- self.send("{modules.%s} connected from %s:%d, version %s" % (module.name, addr.host, addr.port, module.version))
+ self.send("{modules.%s} connected from %s" % (module.name, addr))
def moduleDisconnected (self, module, reason) :
self.send("{modules.%s} disconnected: %s" % (module.name, reason))
@@ -112,7 +112,7 @@
try :
module, addr = self.nexus.getModuleInfo(cmd)
- return "%s is version %d from %s:%d. Events: %s. See `commands %s' for a list of commands" % (module.name, module.version, addr.host, addr.port, ', '.join(module.event_types), module.name)
+ return "%s from %s. Events: %s. See `commands %s' for a list of commands" % (module.name, addr, ', '.join(module.event_types), module.name)
except KeyError :
raise ReplyException("No command/module called `%s'. See `help commands'" % cmd)