[minion-cvs] Stricter handling of conflicting modules

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion/server
In directory moria.mit.edu:/tmp/cvs-serv17858/lib/mixminion/server

Modified Files:
	Modules.py ServerMain.py 
Log Message:
Stricter handling of conflicting modules

Index: Modules.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/Modules.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Modules.py	7 Jan 2003 01:41:20 -0000	1.16
+++ Modules.py	7 Jan 2003 03:31:30 -0000	1.17
@@ -300,7 +300,7 @@
         for t in module.getExitTypes():
             if (self.typeToModule.has_key(t) and
                 self.typeToModule[t].getName() != module.getName()):
-                LOG.warn("More than one module is enabled for type %x"%t)
+                raise ConfigError("Multiple modules enabled for type %x: %s vs %s:"%(t, self.typeToModule[t].getName(), module.getName()))
             self.typeToModule[t] = module
 
         LOG.info("Module %s: enabled for types %s",

Index: ServerMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerMain.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ServerMain.py	7 Jan 2003 03:06:49 -0000	1.21
+++ ServerMain.py	7 Jan 2003 03:31:30 -0000	1.22
@@ -452,6 +452,7 @@
             sys.exit(1)
 
     try:
+        print >>sys.stderr, "Reading configuration from %s"%configFile
         return mixminion.server.ServerConfig.ServerConfig(fname=configFile)
     except (IOError, OSError), e:
         print >>sys.stderr, "Error reading configuration file %r:"%configFile