#40 Fixed problem with LOAD command not working

[casparcg] / common / log.h

diff --git a/common/log.h b/common/log.h
index 665591d2aa7889cb0cdf1da3ceb41b8c3e2f0e2f..4cc983e4556f0b787a1c10df62f7bc28a17f352c 100644 (file)
--- a/common/log.h
+++ b/common/log.h
@@ -22,12 +22,21 @@
 #pragma once
 
 #include "os/stack_trace.h"
+#include "utf.h"
+#include "thread_info.h"
+#include "enum_class.h"
 
 #include <boost/log/trivial.hpp>
+#include <boost/log/expressions.hpp>
 #include <boost/log/sources/global_logger_storage.hpp>
+#include <boost/log/sources/severity_channel_logger.hpp>
+#include <boost/exception/all.hpp>
+#include <boost/property_tree/ptree_fwd.hpp>
 
 #include <string>
 #include <locale>
+#include <functional>
+#include <memory>
 
 namespace caspar { namespace log {
        
@@ -56,52 +65,58 @@ inline std::basic_string<T> replace_nonprintable_copy(std::basic_string<T, std::
        return str;
 }
 
-void add_file_sink(const std::wstring& folder);
+void add_file_sink(const std::wstring& file, const boost::log::filter& filter);
+std::shared_ptr<void> add_preformatted_line_sink(std::function<void(std::string line)> formatted_line_sink);
 
-/*template< typename CharT, typename TraitsT >
-inline std::basic_ostream< CharT, TraitsT >& operator<< (
-       std::basic_ostream< CharT, TraitsT >& strm, severity_level lvl)
+enum class log_category
 {
-       if(lvl == trace)
-               strm << "trace";
-       else if(lvl == debug)
-               strm << "debug";
-       else if(lvl == info)
-               strm << "info";
-       else if(lvl == warning)
-               strm << "warning";
-       else if(lvl == error)
-               strm << "error";
-       else if(lvl == fatal)
-               strm << "fatal";
-       else
-               strm << static_cast<int>(lvl);
-
-       return strm;
-}*/
-
-typedef boost::log::sources::wseverity_logger_mt<boost::log::trivial::severity_level> caspar_logger;
+       normal                  = 1,
+       calltrace               = 2,
+       communication   = 4
+};
+ENUM_ENABLE_BITWISE(log_category)
+BOOST_LOG_ATTRIBUTE_KEYWORD(category, "Channel", ::caspar::log::log_category)
+
+typedef boost::log::sources::wseverity_channel_logger_mt<boost::log::trivial::severity_level, log_category> caspar_logger;
 
 BOOST_LOG_INLINE_GLOBAL_LOGGER_INIT(logger, caspar_logger)
 {
        internal::init();
-       return caspar_logger(boost::log::trivial::trace);
+       return caspar_logger(
+                       boost::log::keywords::severity = boost::log::trivial::trace,
+                       boost::log::keywords::channel = log_category::normal);
 }
 
 #define CASPAR_LOG(lvl)\
-       BOOST_LOG_SEV(::caspar::log::logger::get(), ::boost::log::trivial::lvl)
+       BOOST_LOG_CHANNEL_SEV(::caspar::log::logger::get(), ::caspar::log::log_category::normal,                ::boost::log::trivial::lvl)
+#define CASPAR_LOG_CALL(lvl)\
+       BOOST_LOG_CHANNEL_SEV(::caspar::log::logger::get(), ::caspar::log::log_category::calltrace,             ::boost::log::trivial::lvl)
+#define CASPAR_LOG_COMMUNICATION(lvl)\
+       BOOST_LOG_CHANNEL_SEV(::caspar::log::logger::get(), ::caspar::log::log_category::communication, ::boost::log::trivial::lvl)
 
 #define CASPAR_LOG_CALL_STACK()        try{\
-               CASPAR_LOG(info) << L"callstack:\n" << caspar::get_call_stack();\
+               CASPAR_LOG(info) << L"callstack (" << caspar::get_thread_info().name << L"):\n" << caspar::get_call_stack();\
        }\
        catch(...){}
 
 #define CASPAR_LOG_CURRENT_EXCEPTION() try{\
-               CASPAR_LOG(error)  << caspar::u16(boost::current_exception_diagnostic_information()) << L"Caught at:\n" << caspar::get_call_stack();\
+               CASPAR_LOG(error) << caspar::u16(boost::current_exception_diagnostic_information()) << L"Caught at (" << caspar::get_thread_info().name << L"):\n" << caspar::get_call_stack();\
        }\
        catch(...){}
-       
+
+#define CASPAR_LOG_CURRENT_EXCEPTION_AT_LEVEL(lvl) try{\
+               CASPAR_LOG(lvl) << caspar::u16(boost::current_exception_diagnostic_information()) << L"Caught at (" << caspar::get_thread_info().name << L"):\n" << caspar::get_call_stack();\
+       }\
+       catch(...){}
+
 void set_log_level(const std::wstring& lvl);
+void set_log_category(const std::wstring& cat, bool enabled);
+
+void print_child(
+               boost::log::trivial::severity_level level,
+               const std::wstring& indent,
+               const std::wstring& elem,
+               const boost::property_tree::wptree& tree);
 
 }}