[Zope-Checkins] SVN: Zope/branches/regebro-wsgi_support2/lib/python/Zope2/Startup/__init__.py Added an error message for misconfiguration.

[Lennart Regebro]

Log message for revision 67790:
  Added an error message for misconfiguration.
  

Changed:
  U   Zope/branches/regebro-wsgi_support2/lib/python/Zope2/Startup/__init__.py

-=-
Modified: Zope/branches/regebro-wsgi_support2/lib/python/Zope2/Startup/__init__.py
===================================================================
--- Zope/branches/regebro-wsgi_support2/lib/python/Zope2/Startup/__init__.py	2006-05-01 11:19:56 UTC (rev 67789)
+++ Zope/branches/regebro-wsgi_support2/lib/python/Zope2/Startup/__init__.py	2006-05-01 11:24:08 UTC (rev 67790)
@@ -116,9 +116,13 @@
             from App.config import getConfiguration
             config = getConfiguration()
             import ZServer
+            if config.twisted_servers and config.servers:
+                raise ZConfig.ConfigurationError(
+                    "You can't run both ZServer servers and twisted servers.")
             if config.twisted_servers:
                 if not _use_twisted:
-                    raise ImportError("You do not have twisted installed.")
+                    raise ZConfig.ConfigurationError(
+                        "You do not have twisted installed.")
                 twisted.internet.reactor.run()
                 # Storing the exit code in the ZServer even for twisted, 
                 # but hey, it works...