X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shell%2Fmain.cpp;h=d742cb0d9c633f6fe2361cae894035aaa11178f3;hb=e75624659ed539334f9c83a99404c20206df76e3;hp=5cfbb4d15e195b2dece8cc650096b14837243710;hpb=16b9e3cfec4092598f1a68e804248242d6fc141d;p=casparcg

diff --git a/shell/main.cpp b/shell/main.cpp
index 5cfbb4d15..d742cb0d9 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -61,10 +61,13 @@
 #include <boost/thread.hpp>
 #include <boost/thread/future.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
 
 #include <tbb/atomic.h>
 
 #include <future>
+#include <set>
 
 #include <csignal>
 
@@ -116,6 +119,7 @@ void do_run(
 
 		if(boost::iequals(wcmd, L"EXIT") || boost::iequals(wcmd, L"Q") || boost::iequals(wcmd, L"QUIT") || boost::iequals(wcmd, L"BYE"))
 		{
+			CASPAR_LOG(info) << L"Received message from Console: " << wcmd << L"\\r\\n";
 			should_wait_for_keypress = true;
 			shutdown_server_now.set_value(false);	//false to not restart
 			break;
@@ -212,7 +216,7 @@ bool run(const std::wstring& config_file_name, tbb::atomic<bool>& should_wait_fo
 
 	// Create server object which initializes channels, protocols and controllers.
 	std::unique_ptr<server> caspar_server(new server(shutdown_server_now));
-	
+
 	// Print environment information.
 	print_system_info(caspar_server->get_system_info_provider_repo());
 
@@ -221,7 +225,10 @@ bool run(const std::wstring& config_file_name, tbb::atomic<bool>& should_wait_fo
 	boost::property_tree::write_xml(str, env::properties(), w);
 	CASPAR_LOG(info) << config_file_name << L":\n-----------------------------------------\n" << str.str() << L"-----------------------------------------";
 	
-	caspar_server->start();
+	{
+		CASPAR_SCOPED_CONTEXT_MSG(config_file_name + L": ")
+		caspar_server->start();
+	}
 
 	// Create a dummy client which prints amcp responses to console.
 	auto console_client = spl::make_shared<IO::ConsoleClientInfo>();
@@ -296,12 +303,18 @@ int main(int argc, char** argv)
 		env::configure(config_file_name);
 
 		log::set_log_level(env::properties().get(L"configuration.log-level", L"info"));
+		auto log_categories_str = env::properties().get(L"configuration.log-categories", L"communication");
+		std::set<std::wstring> log_categories;
+		boost::split(log_categories, log_categories_str, boost::is_any_of(L", "));
+		for (auto& log_category : { L"calltrace", L"communication" })
+			log::set_log_category(log_category, log_categories.find(log_category) != log_categories.end());
 
 		if (env::properties().get(L"configuration.debugging.remote", false))
 			wait_for_remote_debugging();
 
 		// Start logging to file.
-		log::add_file_sink(env::log_folder());			
+		log::add_file_sink(env::log_folder() + L"caspar",		caspar::log::category != caspar::log::log_category::calltrace);
+		log::add_file_sink(env::log_folder() + L"calltrace",	caspar::log::category == caspar::log::log_category::calltrace);
 		std::wcout << L"Logging [info] or higher severity to " << env::log_folder() << std::endl << std::endl;
 		
 		// Setup console window.
@@ -320,7 +333,7 @@ int main(int argc, char** argv)
 		
 		CASPAR_LOG(info) << "Successfully shutdown CasparCG Server.";
 
-		if (!should_wait_for_keypress)
+		if (should_wait_for_keypress)
 			wait_for_keypress();
 	}
 	catch(const boost::property_tree::file_parser_error& e)