(LogDB): added --logdb-httpserver-reply-addr

conf/libuniset2.spec

@@ -511,6 +511,8 @@ rm -f %buildroot%_libdir/*.la
 %changelog
 * Tue May 08 2018 Pavel Vainerman <pv@altlinux.ru> 2.7-alt7
 - (http): added support "CORS" (Access-Control-Allow-Origin)
+- (logdb): added --logdb-httpserver-reply-addr host:port
+- minor fixes in LogSession
 
 * Tue Apr 03 2018 Pavel Vainerman <pv@altlinux.ru> 2.7-alt6
 - new minor release

extensions/LogDB/LogDB.cc

@@ -231,6 +231,8 @@ LogDB::LogDB( const string& name, int argc, const char* const* argv, const strin
 	httpHost = uniset::getArgParam("--" + prefix + "httpserver-host", argc, argv, "localhost");
 	httpPort = uniset::getArgInt("--" + prefix + "httpserver-port", argc, argv, "8080");
 	httpCORS_allow = uniset::getArgParam("--" + prefix + "httpserver-cors-allow", argc, argv, httpCORS_allow);
+	httpReplyAddr = uniset::getArgParam("--" + prefix + "httpserver-reply-addr", argc, argv, "");
+
 	dblog1 << myname << "(init): http server parameters " << httpHost << ":" << httpPort << endl;
 	Poco::Net::SocketAddress sa(httpHost, httpPort);
 
@@ -461,6 +463,7 @@ void LogDB::help_print()
 	cout << "--prefix-httpserver-max-queued num          - Размер очереди запросов к http серверу. По умолчанию: 100" << endl;
 	cout << "--prefix-httpserver-max-threads num         - Разрешённое количество потоков для http-сервера. По умолчанию: 3" << endl;
 	cout << "--prefix-httpserver-cors-allow addr         - (CORS): Access-Control-Allow-Origin. Default: *" << endl;
+	cout << "--prefix-httpserver-reply-addr host[:port]  - Адрес отдаваемый клиенту для подключения. По умолчанию адрес узла где запущен logdb" << endl;
 }
 // -----------------------------------------------------------------------------
 void LogDB::run( bool async )
@@ -1539,7 +1542,7 @@ void LogDB::httpWebSocketPage( std::ostream& ostr, Poco::Net::HTTPServerRequest&
 	for( const auto& l : logservers )
 	{
 		ostr << "  <li><a target='_blank' href=\"http://"
-			 << req.serverAddress().toString()
+			 << ( httpReplyAddr.empty() ? req.serverAddress().toString() : httpReplyAddr )
 			 << "/logdb/ws/" << l->name << "\">"
 			 << l->name << "</a>  &#8211; "
 			 << "<i>" << l->description << "</i></li>"
@@ -1588,7 +1591,7 @@ void LogDB::httpWebSocketConnectPage( ostream& ostr,
 	ostr << "  if (\"WebSocket\" in window)" << endl;
 	ostr << "  {" << endl;
 	ostr << "    // LogScrollTimer = setInterval(LogAutoScroll,800);" << endl;
-	ostr << "    var ws = new WebSocket(\"ws://" << req.serverAddress().toString() << "/logdb/ws/\" + logname);" << endl;
+	ostr << "    var ws = new WebSocket(\"ws://" << ( httpReplyAddr.empty() ? req.serverAddress().toString() : httpReplyAddr ) << "/logdb/ws/\" + logname);" << endl;
 	ostr << "    var l = document.getElementById('logname');" << endl;
 	ostr << "    l.innerHTML = logname" << endl;
 	ostr << "    ws.onmessage = function(evt)" << endl;

extensions/LogDB/LogDB.h

@@ -316,6 +316,7 @@ namespace uniset
 			std::string httpHost = { "" };
 			int httpPort = { 0 };
 			std::string httpCORS_allow = { "*" };
+			std::string httpReplyAddr = { "" };
 
 			double wsHeartbeatTime_sec = { 3.0 };
 			double wsSendTime_sec = { 0.5 };