* 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
#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
#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
#include <boost/log/sinks/text_ostream_backend.hpp>\r
#include <boost/log/sinks/sync_frontend.hpp>\r
#include <boost/log/sinks/async_frontend.hpp>\r
+#include <boost/log/core/record.hpp>\r
+#include <boost/log/utility/attribute_value_extractor.hpp>\r
\r
#include <boost/log/utility/init/common_attributes.hpp>\r
#include <boost/log/utility/empty_deleter.hpp>\r
+#include <boost/lambda/lambda.hpp>\r
\r
-\r
-namespace caspar{ namespace log{\r
+namespace caspar { namespace log {\r
\r
using namespace boost;\r
\r
-namespace internal{\r
+void my_formatter(std::wostream& strm, boost::log::basic_record<wchar_t> const& rec)\r
+{\r
+ namespace lambda = boost::lambda;\r
+ \r
+ #pragma warning(disable : 4996)\r
+ time_t rawtime;\r
+ struct tm* timeinfo;\r
+ time(&rawtime );\r
+ timeinfo = localtime ( &rawtime );\r
+ char buffer [80];\r
+ strftime (buffer,80, "%c", timeinfo);\r
+ strm << L"[" << buffer << L"] ";\r
+ \r
+ boost::log::attributes::current_thread_id::held_type thread_id;\r
+ if(boost::log::extract<boost::log::attributes::current_thread_id::held_type>(L"ThreadID", rec.attribute_values(), lambda::var(thread_id) = lambda::_1))\r
+ strm << L"[" << thread_id << L"] ";\r
+\r
+ severity_level severity;\r
+ if(boost::log::extract<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get(), rec.attribute_values(), lambda::var(severity) = lambda::_1))\r
+ strm << L"[" << severity << L"] ";\r
+\r
+ strm << rec.message();\r
+}\r
\r
+namespace internal{\r
+ \r
void init()\r
{ \r
boost::log::add_common_attributes<wchar_t>();\r
stream_backend->auto_flush(true);\r
\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(\r
- boost::log::formatters::wstream\r
- //<< L"[" << boost::log::formatters::date_time<std::tm>(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
+ stream_sink->locked_backend()->set_formatter(&my_formatter);\r
\r
boost::log::wcore::get()->add_sink(stream_sink);\r
}\r
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<std::tm>(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()) >= 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
}\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
projects / casparcg / blobdiff