#346 #441 Added remote debugging support in html producer.

[casparcg] / modules / html / html.cpp

diff --git a/modules/html/html.cpp b/modules/html/html.cpp
index a52d6663a45a8cef75e4dc5c49d20bf9662fe4d6..dc7365b4a4a05b62456b0bb50f693a2475ffb360 100644 (file)
--- a/modules/html/html.cpp
+++ b/modules/html/html.cpp
@@ -26,6 +26,7 @@
 
 #include <common/executor.h>
 #include <common/future.h>
+#include <common/env.h>
 
 #include <core/producer/cg_proxy.h>
 
@@ -38,12 +39,14 @@
 #include <boost/thread/future.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/log/trivial.hpp>
+#include <boost/property_tree/ptree.hpp>
 
 #include <map>
 
 #pragma warning(push)
 #pragma warning(disable: 4458)
 #include <cef_app.h>
+#include <cef_version.h>
 #pragma warning(pop)
 
 #pragma comment(lib, "libcef.lib")
@@ -232,6 +235,7 @@ void init(core::module_dependencies dependencies)
        {
                CefSettings settings;
                settings.no_sandbox = true;
+               settings.remote_debugging_port = env::properties().get(L"configuration.html.remote-debugging-port", 0);
                //settings.windowless_rendering_enabled = true;
                CefInitialize(main_args, settings, nullptr, nullptr);
        });
@@ -256,6 +260,23 @@ void init(core::module_dependencies dependencies)
                        },
                        false
        );
+
+       auto cef_version_major =        boost::lexical_cast<std::wstring>(cef_version_info(0));
+       auto cef_revision =                     boost::lexical_cast<std::wstring>(cef_version_info(1));
+       auto chrome_major =                     boost::lexical_cast<std::wstring>(cef_version_info(2));
+       auto chrome_minor =                     boost::lexical_cast<std::wstring>(cef_version_info(3));
+       auto chrome_build =                     boost::lexical_cast<std::wstring>(cef_version_info(4));
+       auto chrome_patch =                     boost::lexical_cast<std::wstring>(cef_version_info(5));
+
+       dependencies.system_info_provider_repo->register_version_provider(L"cef", [=]
+       {
+               return cef_version_major + L"." + chrome_build + L"." + cef_revision;
+       });
+       dependencies.system_info_provider_repo->register_system_info_provider([=](boost::property_tree::wptree& info)
+       {
+               info.add(L"system.cef.version",                 cef_version_major       + L"." + chrome_build + L"." + cef_revision);
+               info.add(L"system.cef.chromeversion",   chrome_major            + L"." + chrome_minor + L"." + chrome_build + L"." + chrome_patch);
+       });
 }
 
 void uninit()
@@ -284,13 +305,13 @@ public:
 
        void Execute() override
        {
-               CASPAR_LOG(trace) << "[cef_task] executing task";
+               CASPAR_LOG_CALL(trace) << "[cef_task] executing task";
 
                try
                {
                        function_();
                        promise_.set_value();
-                       CASPAR_LOG(trace) << "[cef_task] task succeeded";
+                       CASPAR_LOG_CALL(trace) << "[cef_task] task succeeded";
                }
                catch (...)
                {