[scene_producer] Added possibility to CALL/CG PLAY/CG STOP/CG NEXT/CG INVOKE layers...

[casparcg] / common / log.h

diff --git a/common/log.h b/common/log.h
index 3deb67f2f4257ebc5d968e5951477717933156f0..9df9470f2f7f364d59b106ae4df8d35f03bf1b65 100644 (file)
--- a/common/log.h
+++ b/common/log.h
@@ -24,9 +24,12 @@
 #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>
 
@@ -36,20 +39,23 @@
 #include <memory>
 
 namespace caspar { namespace log {
-       
+
 namespace internal{
 void init();
 std::wstring get_call_stack();
+std::string current_exception_diagnostic_information();
 }
 
+const char* remove_source_prefix(const char* file);
+
 template<typename T>
 inline void replace_nonprintable(std::basic_string<T, std::char_traits<T>, std::allocator<T>>& str, T with)
 {
        std::locale loc;
        std::replace_if(str.begin(), str.end(), [&](T c)->bool {
-               return 
-                       (!std::isprint(c, loc) 
-                       && c != '\r' 
+               return
+                       (!std::isprint(c, loc)
+                       && c != '\r'
                        && c != '\n')
                        || c > static_cast<T>(127);
        }, with);
@@ -62,19 +68,34 @@ 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);
 
-typedef boost::log::sources::wseverity_logger_mt<boost::log::trivial::severity_level> caspar_logger;
+enum class log_category
+{
+       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 (" << caspar::get_thread_info().name << L"):\n" << caspar::get_call_stack();\
@@ -82,16 +103,17 @@ BOOST_LOG_INLINE_GLOBAL_LOGGER_INIT(logger, caspar_logger)
        catch(...){}
 
 #define CASPAR_LOG_CURRENT_EXCEPTION() try{\
-               CASPAR_LOG(error) << caspar::u16(boost::current_exception_diagnostic_information()) << L"Caught at (" << caspar::get_thread_info().name << L"):\n" << caspar::get_call_stack();\
+               CASPAR_LOG(error) << caspar::u16(::caspar::log::internal::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();\
+               CASPAR_LOG(lvl) << caspar::u16(::caspar::log::internal::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,
@@ -100,4 +122,3 @@ void print_child(
                const boost::property_tree::wptree& tree);
 
 }}
-