Nicer printing.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@1933 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/common/log/log.cpp b/common/log/log.cpp
index 645b6e5b5ff6d36da0e57e0713aa2faebfadc6fd..d76debf77e83c27b6017e602de70261aea18a820 100644 (file)
--- a/common/log/log.cpp
+++ b/common/log/log.cpp
@@ -158,17 +158,17 @@ void add_file_sink(const std::wstring& folder)
 \r
 void set_log_level(const std::wstring& lvl)\r
 {      \r
-       if(boost::iequals(lvl, L"trace"))\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
+       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
+       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
+       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
+       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

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index f19f241170995249073b09c57eda68c6428b59ac..961a4b7418f0b992ca0674f68a4929d3ec870278 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -179,7 +179,7 @@ public:
                if(FAILED(CComObject<caspar::flash::FlashAxContainer>::CreateInstance(&ax_)))\r
                        BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Failed to create FlashAxContainer"));\r
                \r
-               ax_->set_print([this]{return L"flash_renderer";});\r
+               ax_->set_print([this]{return print();});\r
 \r
                if(FAILED(ax_->CreateAxControl()))\r
                        BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Failed to Create FlashAxControl"));\r

diff --git a/protocol/util/AsyncEventServer.cpp b/protocol/util/AsyncEventServer.cpp
index 9c55c89400ac15e38c93bc499f17f0ec8e8c6ebe..98fbd7d2e1dc2c457c419bd7ed8734f3f6b72ef7 100644 (file)
--- a/protocol/util/AsyncEventServer.cpp
+++ b/protocol/util/AsyncEventServer.cpp
@@ -435,7 +435,7 @@ void AsyncEventServer::DoSend(SocketInfo& socketInfo) {
                        else {\r
                                if(sentBytes == bytesToSend) {\r
                                        if(sentBytes < 512)\r
-                                               CASPAR_LOG(info) << "Sent: " << socketInfo.sendQueue_.front().c_str() << TEXT(" to ") << socketInfo.host_.c_str();\r
+                                               CASPAR_LOG(info) << L"Sent message to " << socketInfo.host_.c_str() << L": " << socketInfo.sendQueue_.front().c_str();\r
                                        else\r
                                                CASPAR_LOG(info) << "Sent more than 512 bytes to " << socketInfo.host_.c_str();\r
 \r