2.0.0.2: log: Some fixes.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@857 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/common/log/log.cpp b/common/log/log.cpp
index 7fbf20171e07e86216a1f5d417e1ce537d956eda..d82f66d3c2c1cf51107aa122365e62be0ed72d8b 100644 (file)
--- a/common/log/log.cpp
+++ b/common/log/log.cpp
@@ -61,24 +61,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 +93,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
@@ -126,6 +110,7 @@ void init()
 \r
        boost::log::wcore::get()->add_sink(stream_sink);\r
 }\r
+\r
 }\r
 \r
 void add_file_sink(const std::wstring& folder)\r
@@ -145,14 +130,8 @@ 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->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