2.0.2: Improved log messages. In particular regarding GPU stall warning.

[casparcg] / common / log / log.cpp

diff --git a/common/log/log.cpp b/common/log/log.cpp
index d82f66d3c2c1cf51107aa122365e62be0ed72d8b..3446e5c34ac0f9ad5a118aae38fa7d6322ad47a4 100644 (file)
--- a/common/log/log.cpp
+++ b/common/log/log.cpp
@@ -17,6 +17,9 @@
 *    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
 *\r
 */\r
+// TODO: Colors in console.\r
+// TODO: Think through filters.\r
+\r
 #include "../stdafx.h"\r
 \r
 #if defined(_MSC_VER)\r
@@ -27,7 +30,7 @@
 #include "log.h"\r
 \r
 #include "../exception/exceptions.h"\r
-\r
+#include "../utility/string.h"\r
 #include <ios>\r
 #include <string>\r
 #include <ostream>\r
@@ -36,6 +39,7 @@
 #include <boost/make_shared.hpp>\r
 #include <boost/filesystem/convenience.hpp>\r
 #include <boost/date_time/posix_time/posix_time.hpp>\r
+#include <boost/algorithm/string.hpp>\r
 \r
 #include <boost/log/core/core.hpp>\r
 \r
@@ -106,6 +110,12 @@ void init()
 \r
        auto stream_sink = boost::make_shared<stream_sink_type>(stream_backend);\r
        \r
+//#ifdef NDEBUG\r
+//     stream_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);\r
+//#else\r
+//     stream_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);\r
+//#endif\r
+\r
        stream_sink->locked_backend()->set_formatter(&my_formatter);\r
 \r
        boost::log::wcore::get()->add_sink(stream_sink);\r
@@ -133,8 +143,11 @@ void add_file_sink(const std::wstring& folder)
                \r
                file_sink->locked_backend()->set_formatter(&my_formatter);\r
 \r
-               file_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= info);\r
-               \r
+//#ifdef NDEBUG\r
+//             file_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);\r
+//#else\r
+//             file_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);\r
+//#endif\r
                boost::log::wcore::get()->add_sink(file_sink);\r
 \r
                CASPAR_LOG(info) << L"Logging [info] or higher severity to " << folder << std::endl << std::endl;\r
@@ -145,4 +158,20 @@ void add_file_sink(const std::wstring& folder)
        }\r
 }\r
 \r
+void set_log_level(const std::wstring& lvl)\r
+{      \r
+       if(boost::iequals(lvl, L"trace"))\r
+               boost::log::wcore::get()->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= trace);\r
+       else if(boost::iequals(lvl, L"debug"))\r
+               boost::log::wcore::get()->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);\r
+       else if(boost::iequals(lvl, L"info"))\r
+               boost::log::wcore::get()->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= info);\r
+       else if(boost::iequals(lvl, L"warning"))\r
+               boost::log::wcore::get()->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= warning);\r
+       else if(boost::iequals(lvl, L"error"))\r
+               boost::log::wcore::get()->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= error);\r
+       else if(boost::iequals(lvl, L"fatal"))\r
+               boost::log::wcore::get()->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= fatal);\r
+}\r
+\r
 }}
\ No newline at end of file