<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13235] twext/trunk/twext/python/log.py</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13235">13235</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-04-09 18:43:23 -0700 (Wed, 09 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>svn commit</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextpythonlogpy">twext/trunk/twext/python/log.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextpythonlogpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/python/log.py (13234 => 13235)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/python/log.py        2014-04-10 01:31:10 UTC (rev 13234)
+++ twext/trunk/twext/python/log.py        2014-04-10 01:43:23 UTC (rev 13235)
</span><span class="lines">@@ -938,40 +938,51 @@
</span><span class="cx">         if moduleName is __name__:
</span><span class="cx">             continue
</span><span class="cx"> 
</span><del>-        for name, obj in module.__dict__.iteritems():
-            try:
-                newLogger = Logger(namespace=module.__name__)
-            except AttributeError:
-                # Can't look up __name__.  A hack in the &quot;six&quot; module causes
-                # this.  Skip the module.
-                # See https://trac.calendarserver.org/ticket/832
-                continue
</del><ins>+        try:
+            for name, obj in module.__dict__.iteritems():
+                try:
+                    newLogger = Logger(namespace=module.__name__)
+                except AttributeError:
+                    # Can't look up __name__.  A hack in the &quot;six&quot; module causes
+                    # this.  Skip the module.
+                    # See https://trac.calendarserver.org/ticket/832
+                    continue
</ins><span class="cx"> 
</span><del>-            legacyLogger = LegacyLogger(logger=newLogger)
</del><ins>+                legacyLogger = LegacyLogger(logger=newLogger)
</ins><span class="cx"> 
</span><del>-            if obj is twisted.python.log:
-                log.info(
-                    &quot;Replacing Twisted log module object {0} in {1}&quot;
-                    .format(name, module.__name__)
-                )
-                setattr(module, name, legacyLogger)
</del><ins>+                if obj is twisted.python.log:
+                    log.info(
+                        &quot;Replacing Twisted log module object {0} in {1}&quot;
+                        .format(name, module.__name__)
+                    )
+                    setattr(module, name, legacyLogger)
</ins><span class="cx"> 
</span><del>-            elif obj is twisted.python.log.msg:
-                log.info(
-                    &quot;Replacing Twisted log.msg object {0} in {1}&quot;
-                    .format(name, module.__name__)
-                )
-                setattr(module, name, legacyLogger.msg)
</del><ins>+                elif obj is twisted.python.log.msg:
+                    log.info(
+                        &quot;Replacing Twisted log.msg object {0} in {1}&quot;
+                        .format(name, module.__name__)
+                    )
+                    setattr(module, name, legacyLogger.msg)
</ins><span class="cx"> 
</span><del>-            elif obj is twisted.python.log.err:
-                log.info(
-                    &quot;Replacing Twisted log.err object {0} in {1}&quot;
-                    .format(name, module.__name__)
-                )
-                setattr(module, name, legacyLogger.err)
</del><ins>+                elif obj is twisted.python.log.err:
+                    log.info(
+                        &quot;Replacing Twisted log.err object {0} in {1}&quot;
+                        .format(name, module.__name__)
+                    )
+                    setattr(module, name, legacyLogger.err)
+        except RuntimeError as e:
+            # Python could use more specific exceptions, eh.
+            # What we mean to catch is:
+            # RuntimeError: dictionary changed size during iteration
+            log.error(
+                &quot;Unable to replace twisted loggers for module {module}: &quot;
+                &quot;{error}&quot;,
+                module=module, error=e
+            )
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> ######################################################################
</span><span class="cx"> # FIXME: This may not be needed; look into removing it.
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>