Fixed bug in server shut down.

[casparcg] / shell / main.cpp

diff --git a/shell/main.cpp b/shell/main.cpp
index ffac2a4cded2060ec96880f06b2942e9099070fc..d742cb0d9c633f6fe2361cae894035aaa11178f3 100644 (file)
--- 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;
@@ -299,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.
@@ -323,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)