From 70ccdabf7c2321632d543814a6017307d891aa0b Mon Sep 17 00:00:00 2001
From: Miguel Portilla <miguelportilla@pobros.com>
Date: Fri, 17 Jul 2015 13:25:58 -0400
Subject: [PATCH] Squelch logs in Env (RIPD-982)

---
 src/ripple/app/tx/tests/Offer.test.cpp |  2 --
 src/ripple/basics/Log.h                | 20 +++++++++++++++++++-
 src/ripple/test/jtx/Env.h              |  4 ++--
 src/ripple/test/jtx/impl/Env_test.cpp  |  4 ----
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/ripple/app/tx/tests/Offer.test.cpp b/src/ripple/app/tx/tests/Offer.test.cpp
index 4e195b1dc..d46d3b50a 100644
--- a/src/ripple/app/tx/tests/Offer.test.cpp
+++ b/src/ripple/app/tx/tests/Offer.test.cpp
@@ -145,8 +145,6 @@ public:
     }
     void run ()
     {
-        // Hack to silence logging
-        deprecatedLogs ().severity (beast::Journal::Severity::kNone);
         testCanceledOffer ();
         testRmFundedOffer ();
     }
diff --git a/src/ripple/basics/Log.h b/src/ripple/basics/Log.h
index 331a8c8cd..aaee88f38 100644
--- a/src/ripple/basics/Log.h
+++ b/src/ripple/basics/Log.h
@@ -219,7 +219,6 @@ private:
         beast::Journal::Severity severity, std::string const& partition);
 };
 
-
 // Wraps a Journal::Stream to skip evaluation of
 // expensive argument lists if the stream is not active.
 #ifndef JLOG
@@ -236,6 +235,25 @@ deprecatedLogs()
     return logs;
 }
 
+class LogSquelcher
+{
+public:
+    LogSquelcher()
+        : severity_(deprecatedLogs().severity())
+    {
+        deprecatedLogs().severity(
+            beast::Journal::Severity::kNone);
+    }
+
+    ~LogSquelcher()
+    {
+        deprecatedLogs().severity(severity_);
+    }
+
+private:
+    beast::Journal::Severity const severity_;
+};
+
 // VFALCO DEPRECATED Inject beast::Journal instead
 #define ShouldLog(s, k) \
     ::ripple::deprecatedLogs()[#k].active(::ripple::Logs::toSeverity (s))
diff --git a/src/ripple/test/jtx/Env.h b/src/ripple/test/jtx/Env.h
index 201827f64..8a8661cc6 100644
--- a/src/ripple/test/jtx/Env.h
+++ b/src/ripple/test/jtx/Env.h
@@ -135,12 +135,12 @@ public:
 private:
     std::shared_ptr<Ledger const> closed_;
     CachedSLEs cachedSLEs_;
-public:
+    LogSquelcher logSquelcher_;
 
+public:
     // Careful with this
     OpenLedger openLedger;
 
-public:
     Env() = delete;
     Env (Env const&) = delete;
     Env& operator= (Env const&) = delete;
diff --git a/src/ripple/test/jtx/impl/Env_test.cpp b/src/ripple/test/jtx/impl/Env_test.cpp
index f7bad2449..e11453edf 100644
--- a/src/ripple/test/jtx/impl/Env_test.cpp
+++ b/src/ripple/test/jtx/impl/Env_test.cpp
@@ -574,10 +574,6 @@ public:
     void
     run()
     {
-        // Hack to silence logging
-        deprecatedLogs().severity(
-            beast::Journal::Severity::kNone);
-
         testAccount();
         testAmount();
         testEnv();