X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=common%2Flog%2Flog.cpp;h=061c3f5b56a99b6d805dcba8a59409c056d1e238;hb=5ab41a6dc4a8c5921b09ecc1590bfb459ffe867f;hp=d6cc96d5777207df480e2a038f9c676cee915a70;hpb=7d78141e326533502fa21faac55d5a562b9bbd8a;p=casparcg

diff --git a/common/log/log.cpp b/common/log/log.cpp
index d6cc96d57..061c3f5b5 100644
--- a/common/log/log.cpp
+++ b/common/log/log.cpp
@@ -17,6 +17,9 @@
 *    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
+// TODO: Colors in console.
+// TODO: Think through filters.
+
 #include "../stdafx.h"
 
 #if defined(_MSC_VER)
@@ -107,11 +110,11 @@ void init()
 
 	auto stream_sink = boost::make_shared<stream_sink_type>(stream_backend);
 	
-#ifdef NDEBUG
-	stream_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= trace);
-#else
-	stream_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= trace);
-#endif
+//#ifdef NDEBUG
+//	stream_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);
+//#else
+//	stream_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);
+//#endif
 
 	stream_sink->locked_backend()->set_formatter(&my_formatter);
 
@@ -133,18 +136,19 @@ void add_file_sink(const std::wstring& folder)
 			BOOST_THROW_EXCEPTION(directory_not_found());
 
 		auto file_sink = boost::make_shared<file_sink_type>(
-			boost::log::keywords::file_name = (folder + L"caspar_%Y-%m-%d_%H-%M-%S.%N.log"),
+			boost::log::keywords::file_name = (folder + L"caspar_%Y-%m-%d.log"),
 			boost::log::keywords::time_based_rotation = boost::log::sinks::file::rotation_at_time_point(0, 0, 0),
-			boost::log::keywords::auto_flush = true
+			boost::log::keywords::auto_flush = true,
+			boost::log::keywords::open_mode = std::ios::app
 		);
 		
 		file_sink->locked_backend()->set_formatter(&my_formatter);
 
-#ifdef NDEBUG
-		file_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= info);
-#else
-		file_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);
-#endif
+//#ifdef NDEBUG
+//		file_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);
+//#else
+//		file_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);
+//#endif
 		boost::log::wcore::get()->add_sink(file_sink);
 
 		CASPAR_LOG(info) << L"Logging [info] or higher severity to " << folder << std::endl << std::endl;