Default log level is now configurable.

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

diff --git a/shell/casparcg.config b/shell/casparcg.config
index bef38c9ab892ac63ab0802d78d1dcc38fe4c872f..2aa3f1cc5d49a3225860765df202f8f4028e898f 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -29,6 +29,7 @@
 </configuration>\r
 \r
 <!--\r
+<log-level>trace [trace|debug|info|warning|error]</log-level>\r
 <blend-modes>false [true|false]</blend-modes>\r
 <auto-transcode>true [true|false]</auto-transcode>\r
 <pipeline-tokens>2 [1..]</pipeline-tokens>\r

diff --git a/shell/main.cpp b/shell/main.cpp
index c231e67bc007f431079871c1c70e85496943aa99..89dec91afff97fd0855602951aac078c775586a7 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -179,9 +179,7 @@ int main(int argc, wchar_t* argv[])
 \r
        // Install structured exception handler.\r
        caspar::win32_exception::install_handler();\r
-\r
-       caspar::log::set_log_level(L"debug");\r
-                       \r
+                               \r
        // Increase time precision. This will increase accuracy of function like Sleep(1) from 10 ms to 1 ms.\r
        struct inc_prec\r
        {\r
@@ -207,6 +205,8 @@ int main(int argc, wchar_t* argv[])
                // Configure environment properties from configuration.\r
                caspar::env::configure(L"casparcg.config");\r
                                \r
+               caspar::log::set_log_level(caspar::env::properties().get(L"configuration.log-level", L"debug"));\r
+\r
        #ifdef _DEBUG\r
                if(caspar::env::properties().get(L"configuration.debugging.remote", false))\r
                        MessageBox(nullptr, TEXT("Now is the time to connect for remote debugging..."), TEXT("Debug"), MB_OK | MB_TOPMOST);\r