util.log: send log.err to Twisted too, so that Trial tests are flunked

diff --git a/src/allmydata/util/log.py b/src/allmydata/util/log.py
index c5faa9b1b87e6c3c2c0cb3cfad6d3cf5e4316aaf..d8fb0786f8335db8aec948cbc8dbcd4acf1e3b3c 100644 (file)
--- a/src/allmydata/util/log.py
+++ b/src/allmydata/util/log.py
@@ -1,5 +1,6 @@
 
 from foolscap.logging import log
+from twisted.python import log as tw_log
 
 NOISY = log.NOISY # 10
 OPERATIONAL = log.OPERATIONAL # 20
@@ -13,8 +14,13 @@ BAD = log.BAD # 40
 
 msg = log.msg
 
+# If log.err() happens during a unit test, the unit test should fail. We
+# accomplish this by sending it to twisted.log too. When a WEIRD/SCARY/BAD
+# thing happens that is nevertheless handled, use log.msg(failure=f,
+# level=WEIRD) instead.
+
 def err(*args, **kwargs):
-    # this should probably be in foolscap
+    tw_log.err(*args, **kwargs)
     if 'level' not in kwargs:
         kwargs['level'] = log.UNUSUAL
     return log.err(*args, **kwargs)