From 367a9f9a0c9c0056d0800c3dc7e7e62caafb77d2 Mon Sep 17 00:00:00 2001
From: Liu Ming <miliu@statoil.com>
Date: Mon, 23 May 2016 10:12:29 +0800
Subject: [PATCH 1/4] Add default simple logging.

---
 opm/common/OpmLog/OpmLog.cpp | 10 ++++++++++
 opm/common/OpmLog/OpmLog.hpp |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/opm/common/OpmLog/OpmLog.cpp b/opm/common/OpmLog/OpmLog.cpp
index 5b110ed7a..ff105591b 100644
--- a/opm/common/OpmLog/OpmLog.cpp
+++ b/opm/common/OpmLog/OpmLog.cpp
@@ -19,6 +19,8 @@
 
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/common/OpmLog/Logger.hpp>
+#include <opm/common/OpmLog/StreamLog.hpp>
+#include <iostream>
 
 namespace Opm {
 
@@ -160,6 +162,14 @@ namespace Opm {
     }
 
 
+
+    void OpmLog::setupSimpleDefaultLogging(const bool& use_prefix)
+    {
+         std::shared_ptr<StreamLog> streamLog = std::make_shared<StreamLog>(std::cout, Log::DefaultMessageTypes);
+         OpmLog::addBackend( "STREAMLOG", streamLog);
+         streamLog->setMessageLimiter(std::make_shared<MessageLimiter>(10));
+         streamLog->setMessageFormatter(std::make_shared<SimpleMessageFormatter>(use_prefix, true));
+    }
 /******************************************************************/
 
     std::shared_ptr<Logger> OpmLog::m_logger;
diff --git a/opm/common/OpmLog/OpmLog.hpp b/opm/common/OpmLog/OpmLog.hpp
index a0abe3cf2..26006d7ba 100644
--- a/opm/common/OpmLog/OpmLog.hpp
+++ b/opm/common/OpmLog/OpmLog.hpp
@@ -62,7 +62,7 @@ public:
     static void removeAllBackends();
     static bool enabledMessageType( int64_t messageType );
     static void addMessageType( int64_t messageType , const std::string& prefix);
-
+    static void setupSimpleDefaultLogging(const bool& use_prefix);
 
     template <class BackendType>
     static std::shared_ptr<BackendType> getBackend(const std::string& name) {

From 77a3df1a6140f5754c9869703fafdbc33a086df4 Mon Sep 17 00:00:00 2001
From: Liu Ming <miliu@statoil.com>
Date: Mon, 23 May 2016 15:01:28 +0800
Subject: [PATCH 2/4] pass value not reference.

---
 opm/common/OpmLog/OpmLog.cpp | 4 ++--
 opm/common/OpmLog/OpmLog.hpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opm/common/OpmLog/OpmLog.cpp b/opm/common/OpmLog/OpmLog.cpp
index ff105591b..9f67d8517 100644
--- a/opm/common/OpmLog/OpmLog.cpp
+++ b/opm/common/OpmLog/OpmLog.cpp
@@ -163,10 +163,10 @@ namespace Opm {
 
 
 
-    void OpmLog::setupSimpleDefaultLogging(const bool& use_prefix)
+    void OpmLog::setupSimpleDefaultLogging(const bool use_prefix)
     {
          std::shared_ptr<StreamLog> streamLog = std::make_shared<StreamLog>(std::cout, Log::DefaultMessageTypes);
-         OpmLog::addBackend( "STREAMLOG", streamLog);
+         OpmLog::addBackend( "SimpleDefaultLog", streamLog);
          streamLog->setMessageLimiter(std::make_shared<MessageLimiter>(10));
          streamLog->setMessageFormatter(std::make_shared<SimpleMessageFormatter>(use_prefix, true));
     }
diff --git a/opm/common/OpmLog/OpmLog.hpp b/opm/common/OpmLog/OpmLog.hpp
index 26006d7ba..0f70e3996 100644
--- a/opm/common/OpmLog/OpmLog.hpp
+++ b/opm/common/OpmLog/OpmLog.hpp
@@ -62,7 +62,7 @@ public:
     static void removeAllBackends();
     static bool enabledMessageType( int64_t messageType );
     static void addMessageType( int64_t messageType , const std::string& prefix);
-    static void setupSimpleDefaultLogging(const bool& use_prefix);
+    static void setupSimpleDefaultLogging(const bool use_prefix);
 
     template <class BackendType>
     static std::shared_ptr<BackendType> getBackend(const std::string& name) {

From a5afe9065981a19e52c303e595af4e6faac3196d Mon Sep 17 00:00:00 2001
From: Liu Ming <miliu@statoil.com>
Date: Mon, 23 May 2016 15:01:50 +0800
Subject: [PATCH 3/4] add simple test for OpmLog::setupSimpleDefaultLog.

---
 tests/test_OpmLog.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/test_OpmLog.cpp b/tests/test_OpmLog.cpp
index 33fc07b53..8aad9d4c7 100644
--- a/tests/test_OpmLog.cpp
+++ b/tests/test_OpmLog.cpp
@@ -359,3 +359,13 @@ BOOST_AUTO_TEST_CASE(TestOpmLogWithLimits)
     std::cout << log_stream1.str() << std::endl;
     std::cout << log_stream2.str() << std::endl;
 }
+
+
+
+
+BOOST_AUTO_TEST_CASE(TestsetupSimpleLog)
+{
+    bool use_prefix = false;
+    OpmLog::setupSimpleDefaultLogging(use_prefix);
+    BOOST_CHECK_EQUAL(true, OpmLog::hasBackend("SimpleDefautLog"));
+}

From 9aba3ac6b310da1d18866f860885a1aa4c9d6a7a Mon Sep 17 00:00:00 2001
From: Liu Ming <miliu@statoil.com>
Date: Mon, 23 May 2016 15:04:41 +0800
Subject: [PATCH 4/4] fix type error.

---
 tests/test_OpmLog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_OpmLog.cpp b/tests/test_OpmLog.cpp
index 8aad9d4c7..23d4f5bae 100644
--- a/tests/test_OpmLog.cpp
+++ b/tests/test_OpmLog.cpp
@@ -367,5 +367,5 @@ BOOST_AUTO_TEST_CASE(TestsetupSimpleLog)
 {
     bool use_prefix = false;
     OpmLog::setupSimpleDefaultLogging(use_prefix);
-    BOOST_CHECK_EQUAL(true, OpmLog::hasBackend("SimpleDefautLog"));
+    BOOST_CHECK_EQUAL(true, OpmLog::hasBackend("SimpleDefaultLog"));
 }