From 6751829c282a5d5066f83e78e7ae4a3b5914293e Mon Sep 17 00:00:00 2001
From: Sergey Linev <S.Linev@gsi.de>
Date: Thu, 16 Aug 2018 16:58:32 +0200
Subject: [PATCH] webgui: let configure special thread for created http server
---
gui/webdisplay/src/TWebWindowsManager.cxx | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gui/webdisplay/src/TWebWindowsManager.cxx b/gui/webdisplay/src/TWebWindowsManager.cxx
index 3008267e146..dccc19465ec 100644
--- a/gui/webdisplay/src/TWebWindowsManager.cxx
+++ b/gui/webdisplay/src/TWebWindowsManager.cxx
@@ -95,6 +95,24 @@ ROOT::Experimental::TWebWindowsManager::~TWebWindowsManager()
/// In that case only connection from localhost will be available:
///
/// WebGui.HttpLoopback: yes
+///
+/// Or one could specify hostname which should be used for binding of server socket
+///
+/// WebGui.HttpBind: hostname | ipaddress
+///
+/// To use secured protocol, following parameter should be specified
+///
+/// WebGui.UseHttps: yes
+/// WebGui.ServerCert: sertificate_filename.pem
+///
+/// One also can configure usage of special thread of processing of http server requests
+///
+/// WebGui.ServerThrd: yes
+///
+/// If required, one could change websocket timeouts (default is 10000 ms)
+///
+/// WebGui.HttpWStmout: 10000
+
bool ROOT::Experimental::TWebWindowsManager::CreateHttpServer(bool with_http)
{
@@ -109,6 +127,7 @@ bool ROOT::Experimental::TWebWindowsManager::CreateHttpServer(bool with_http)
int http_max = gEnv->GetValue("WebGui.HttpPortMax", 9800);
int http_wstmout = gEnv->GetValue("WebGui.HttpWStmout", 10000);
const char *http_loopback = gEnv->GetValue("WebGui.HttpLoopback", "no");
+ const char *serv_thrd = gEnv->GetValue("WebGui.ServerThrd", "no");
const char *http_bind = gEnv->GetValue("WebGui.HttpBind", "");
const char *http_ssl = gEnv->GetValue("WebGui.UseHttps", "no");
const char *ssl_cert = gEnv->GetValue("WebGui.ServerCert", "rootserver.pem");
@@ -122,6 +141,9 @@ bool ROOT::Experimental::TWebWindowsManager::CreateHttpServer(bool with_http)
return false;
}
+ if (serv_thrd && strstr(serv_thrd, "yes"))
+ fServer->CreateServerThread();
+
if (gApplication)
gApplication->Connect("Terminate(Int_t)", "THttpServer", fServer.get(), "SetTerminate()");
--
GitLab