git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

[casparcg] / common / log / log.cpp

diff --git a/common/log/log.cpp b/common/log/log.cpp
index 7fbf20171e07e86216a1f5d417e1ce537d956eda..802eb93492de3440298253e8a89100e49aa7fd4c 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
@@ -61,24 +65,10 @@
 #include <boost/log/utility/empty_deleter.hpp>\r
 #include <boost/lambda/lambda.hpp>\r
 \r
-namespace caspar{ namespace log{\r
+namespace caspar { namespace log {\r
 \r
 using namespace boost;\r
 \r
-\r
-class system_uptime : public boost::log::attribute\r
-{\r
-    typedef boost::log::attributes::basic_attribute_value<unsigned int> attribute_value_type;\r
-\r
-public:\r
-    boost::shared_ptr<boost::log::attribute_value> get_value()\r
-    {\r
-        unsigned int up;\r
-        up = GetTickCount() / 1000;\r
-        return boost::shared_ptr<boost::log::attribute_value>(new attribute_value_type(up));\r
-    }\r
-};\r
-\r
 void my_formatter(std::wostream& strm, boost::log::basic_record<wchar_t> const& rec)\r
 {\r
     namespace lambda = boost::lambda;\r
@@ -107,8 +97,6 @@ namespace internal{
        \r
 void init()\r
 {      \r
-       boost::log::wcore::get()->add_global_attribute(L"ASD", boost::make_shared<system_uptime>());\r
-\r
        boost::log::add_common_attributes<wchar_t>();\r
        typedef boost::log::aux::add_common_attributes_constants<wchar_t> traits_t;\r
 \r
@@ -122,10 +110,17 @@ 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()) >= trace);\r
+#else\r
+       stream_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= trace);\r
+#endif\r
+\r
        stream_sink->locked_backend()->set_formatter(&my_formatter);\r
 \r
        boost::log::wcore::get()->add_sink(stream_sink);\r
 }\r
+\r
 }\r
 \r
 void add_file_sink(const std::wstring& folder)\r
@@ -145,17 +140,14 @@ void add_file_sink(const std::wstring& folder)
                        boost::log::keywords::time_based_rotation = boost::log::sinks::file::rotation_at_time_point(0, 0, 0),\r
                        boost::log::keywords::auto_flush = true\r
                );\r
-\r
-               //file_sink->locked_backend()->set_formatter(\r
-               //      boost::log::formatters::wstream\r
-               //              //<< L"[" << boost::log::formatters::date_time(L"TimeStamp") << L"] "\r
-               //              << L"[" << boost::log::formatters::attr<boost::log::attributes::current_thread_id::held_type >(L"ThreadID") << L"] "\r
-               //              << L"[" << boost::log::formatters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) << L"] "\r
-               //              << boost::log::formatters::message<wchar_t>()\r
-               //);\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
+               file_sink->locked_backend()->set_formatter(&my_formatter);\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()) >= trace);\r
+#else\r
+               file_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= trace);\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
@@ -166,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