Mercurial > moin > 1.9

changeset 3126:fac1b1e9ea95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
multiconfig: better logging, tell path of config that is used
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Wed, 27 Feb 2008 10:32:52 +0100
parents 40c4670c3410
children ea5383222f2f
files MoinMoin/config/multiconfig.py
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/config/multiconfig.py	Wed Feb 27 10:05:20 2008 +0100
+++ b/MoinMoin/config/multiconfig.py	Wed Feb 27 10:32:52 2008 +0100
@@ -3,7 +3,7 @@
     MoinMoin - Multiple configuration handler and Configuration defaults class
 
     @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
-                2005-2006 MoinMoin:ThomasWaldmann.
+                2005-2008 MoinMoin:ThomasWaldmann.
     @license: GNU GPL, see COPYING for details.
 """
 
@@ -47,6 +47,7 @@
     except ImportError:
         raise
     except IndentationError, err:
+        logging.error(str(err))
         msg = '''IndentationError: %(err)s
 
 The configuration files are python modules. Therefore, whitespace is
@@ -57,6 +58,7 @@
 }
         raise error.ConfigurationError(msg)
     except Exception, err:
+        logging.error(str(err))
         msg = '%s: %s' % (err.__class__.__name__, str(err))
         raise error.ConfigurationError(msg)
     return module, mtime
@@ -76,7 +78,7 @@
         try:
             farmconfig, _farmconfig_mtime = _importConfigModule('farmconfig')
         except ImportError:
-            # Default to wikiconfig for all urls.
+            logging.debug("could not import farmconfig, mapping all URLs to wikiconfig")
             _farmconfig_mtime = 0
             _url_re_cache = [('wikiconfig', re.compile(r'.')), ] # matches everything
         else:
@@ -86,6 +88,7 @@
                     cache.append((name, re.compile(regex)))
                 _url_re_cache = cache
             except AttributeError:
+                logging.error("required 'wikis' list missing in farmconfig")
                 msg = """
 Missing required 'wikis' list in 'farmconfig.py'.
 
@@ -112,7 +115,9 @@
         configClass = getattr(module, 'Config')
         cfg = configClass(name)
         cfg.cfg_mtime = max(mtime, _farmconfig_mtime)
+        logging.info("using config: %s" % os.path.abspath(module.__file__))
     except ImportError, err:
+        logging.error(str(err))
         msg = '''ImportError: %(err)s
 
 Check that the file is in the same directory as the server script. If
@@ -128,6 +133,7 @@
 }
         raise error.ConfigurationError(msg)
     except AttributeError, err:
+        logging.error(str(err))
         msg = '''AttributeError: %(err)s
 
 Could not find required "Config" class in "%(name)s.py".