X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=common%2Flog.h;h=9df9470f2f7f364d59b106ae4df8d35f03bf1b65;hb=62c7da66319a85de98331bcf9dded7490ab62884;hp=2b2dd13a4e544a5895519092f3059867b72e2e3c;hpb=ff8425f00ec870dec6ab0db2a8059fed3f4ce646;p=casparcg

diff --git a/common/log.h b/common/log.h
index 2b2dd13a4..9df9470f2 100644
--- a/common/log.h
+++ b/common/log.h
@@ -1,131 +1,124 @@
-/*
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
-*
-* This file is part of CasparCG (www.casparcg.com).
-*
-* CasparCG is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* CasparCG is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
-*
-* Author: Robert Nagy, ronag89@gmail.com
-*/
-
-#pragma once
-
-#if defined(_MSC_VER)
-#pragma warning (push)
-#pragma warning (disable : 4100)
-#pragma warning (disable : 4127) // conditional expression is constant
-#pragma warning (disable : 4512)
-#pragma warning (disable : 4714) // marked as __forceinline not inlined
-#pragma warning (disable : 4996) // _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include <boost/log/detail/prologue.hpp>
-#include <boost/log/keywords/severity.hpp>
-#include <boost/log/sources/global_logger_storage.hpp>
-#include <boost/log/sources/severity_logger.hpp>
-#include <boost/log/sources/record_ostream.hpp>
-
-#include <string>
-#include <locale>
-
-namespace caspar { namespace log {
-	
-namespace internal{
-void init();
-std::wstring get_call_stack();
-}
-
-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' 
-			&& c != '\n')
-			|| c > static_cast<T>(127);
-	}, with);
-}
-
-template<typename T>
-inline std::basic_string<T> replace_nonprintable_copy(std::basic_string<T, std::char_traits<T>, std::allocator<T>> str, T with)
-{
-	replace_nonprintable(str, with);
-	return str;
-}
-
-void add_file_sink(const std::wstring& folder);
-
-enum severity_level
-{
-	trace,
-	debug,
-	info,
-	warning,
-	error,
-	fatal
-};
-
-template< typename CharT, typename TraitsT >
-inline std::basic_ostream< CharT, TraitsT >& operator<< (
-	std::basic_ostream< CharT, TraitsT >& strm, severity_level lvl)
-{
-	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<severity_level> caspar_logger;
-
-BOOST_LOG_DECLARE_GLOBAL_LOGGER_INIT(logger, caspar_logger)
-{
-	internal::init();
-	return caspar_logger(boost::log::keywords::severity = trace);
-}
-
-#define CASPAR_LOG(lvl)\
-	BOOST_LOG_STREAM_WITH_PARAMS(::caspar::log::get_logger(),\
-		(::boost::log::keywords::severity = ::caspar::log::lvl))
-
-#define CASPAR_LOG_CALL_STACK()	try{\
-		CASPAR_LOG(info) << L"callstack:\n" << caspar::log::internal::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::log::internal::get_call_stack();\
-	}\
-	catch(...){}
-	
-void set_log_level(const std::wstring& lvl);
-
-}}
-
-#if defined(_MSC_VER)
-#pragma warning (pop)
-#endif
\ No newline at end of file
+/*
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Robert Nagy, ronag89@gmail.com
+*/
+
+#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 {
+
+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'
+			&& c != '\n')
+			|| c > static_cast<T>(127);
+	}, with);
+}
+
+template<typename T>
+inline std::basic_string<T> replace_nonprintable_copy(std::basic_string<T, std::char_traits<T>, std::allocator<T>> str, T with)
+{
+	replace_nonprintable(str, with);
+	return str;
+}
+
+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);
+
+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::keywords::severity = boost::log::trivial::trace,
+			boost::log::keywords::channel = log_category::normal);
+}
+
+#define CASPAR_LOG(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();\
+	}\
+	catch(...){}
+
+#define CASPAR_LOG_CURRENT_EXCEPTION() try{\
+		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(::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,
+		const std::wstring& indent,
+		const std::wstring& elem,
+		const boost::property_tree::wptree& tree);
+
+}}