From 8bec3e9702a85b14335144e2164bcd7b3f16c619 Mon Sep 17 00:00:00 2001
From: Dan Callahan <dan.callahan@gmail.com>
Date: Wed, 16 Apr 2014 12:54:40 -0500
Subject: [PATCH] Fixup a comment, suppress logging during tests

- Commit 947470d77112a5ee0ab1a037d77104cdb25c18e5 rendered a comment inaccurate
  in syncserver/__init__.py.

- Logging to stdout by default obscures test results; disable the stdout deluge
  by changing the logging class in syncserver/tests.ini
---
 syncserver/__init__.py | 3 +--
 syncserver/tests.ini   | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/syncserver/__init__.py b/syncserver/__init__.py
index 8b3a6bf..68260c1 100644
--- a/syncserver/__init__.py
+++ b/syncserver/__init__.py
@@ -62,8 +62,7 @@ def includeme(config):
         settings["browserid.backend"] = "tokenserver.verifiers.RemoteVerifier"
         settings["browserid.audiences"] = public_url
     if "metlog.backend" not in settings:
-        # Default to capturing metlog output in memory.
-        # In other words, stop of from being so damn chatty on stdout.
+        # Default to sending metlog output to stdout.
         settings["metlog.backend"] = "mozsvc.metrics.MetlogPlugin"
         settings["metlog.sender_class"] = "metlog.senders.StdOutSender"
         settings["metlog.enabled"] = True
diff --git a/syncserver/tests.ini b/syncserver/tests.ini
index 50b7776..d64cc29 100644
--- a/syncserver/tests.ini
+++ b/syncserver/tests.ini
@@ -15,3 +15,9 @@ public_url = http://localhost:5000/
 
 # This is a secret key used for signing authentication tokens.
 #secret = INSERT_SECRET_KEY_HERE
+
+# Enable metlog during tests, but do not log normal traffic to stdout.
+[metlog]
+backend = "mozsvc.metrics.MetlogPlugin"
+sender_class = "metlog.senders.DebugCaptureSender"
+enabled = True