mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-21 09:10:48 +00:00
Return display name
This commit is contained in:
parent
74e04e1819
commit
4c75b4bc7c
@ -184,7 +184,7 @@ void validateClientInfo(const ClientInfo & session_client_info, const ClientInfo
|
|||||||
namespace DB
|
namespace DB
|
||||||
{
|
{
|
||||||
|
|
||||||
TCPHandler::TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, bool parse_proxy_protocol_, std::string host_name_, const ProfileEvents::Event & read_event_, const ProfileEvents::Event & write_event_)
|
TCPHandler::TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, bool parse_proxy_protocol_, std::string server_display_name_, const ProfileEvents::Event & read_event_, const ProfileEvents::Event & write_event_)
|
||||||
: Poco::Net::TCPServerConnection(socket_)
|
: Poco::Net::TCPServerConnection(socket_)
|
||||||
, server(server_)
|
, server(server_)
|
||||||
, tcp_server(tcp_server_)
|
, tcp_server(tcp_server_)
|
||||||
@ -192,11 +192,11 @@ TCPHandler::TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::N
|
|||||||
, log(getLogger("TCPHandler"))
|
, log(getLogger("TCPHandler"))
|
||||||
, read_event(read_event_)
|
, read_event(read_event_)
|
||||||
, write_event(write_event_)
|
, write_event(write_event_)
|
||||||
, host_name(std::move(host_name_))
|
, server_display_name(std::move(server_display_name_))
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
TCPHandler::TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, TCPProtocolStackData & stack_data, std::string host_name_, const ProfileEvents::Event & read_event_, const ProfileEvents::Event & write_event_)
|
TCPHandler::TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, TCPProtocolStackData & stack_data, std::string server_display_name_, const ProfileEvents::Event & read_event_, const ProfileEvents::Event & write_event_)
|
||||||
: Poco::Net::TCPServerConnection(socket_)
|
: Poco::Net::TCPServerConnection(socket_)
|
||||||
, server(server_)
|
, server(server_)
|
||||||
, tcp_server(tcp_server_)
|
, tcp_server(tcp_server_)
|
||||||
@ -206,7 +206,7 @@ TCPHandler::TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::N
|
|||||||
, read_event(read_event_)
|
, read_event(read_event_)
|
||||||
, write_event(write_event_)
|
, write_event(write_event_)
|
||||||
, default_database(stack_data.default_database)
|
, default_database(stack_data.default_database)
|
||||||
, host_name(std::move(host_name_))
|
, server_display_name(std::move(server_display_name_))
|
||||||
{
|
{
|
||||||
if (!forwarded_for.empty())
|
if (!forwarded_for.empty())
|
||||||
LOG_TRACE(log, "Forwarded client address: {}", forwarded_for);
|
LOG_TRACE(log, "Forwarded client address: {}", forwarded_for);
|
||||||
@ -1201,7 +1201,7 @@ void TCPHandler::sendExtremes(const Block & extremes)
|
|||||||
void TCPHandler::sendProfileEvents()
|
void TCPHandler::sendProfileEvents()
|
||||||
{
|
{
|
||||||
Block block;
|
Block block;
|
||||||
ProfileEvents::getProfileEvents(host_name, state.profile_queue, block, last_sent_snapshots);
|
ProfileEvents::getProfileEvents(server_display_name, state.profile_queue, block, last_sent_snapshots);
|
||||||
if (block.rows() != 0)
|
if (block.rows() != 0)
|
||||||
{
|
{
|
||||||
initProfileEventsBlockOutput(block);
|
initProfileEventsBlockOutput(block);
|
||||||
@ -1536,7 +1536,7 @@ void TCPHandler::sendHello()
|
|||||||
if (client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_SERVER_TIMEZONE)
|
if (client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_SERVER_TIMEZONE)
|
||||||
writeStringBinary(DateLUT::instance().getTimeZone(), *out);
|
writeStringBinary(DateLUT::instance().getTimeZone(), *out);
|
||||||
if (client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_SERVER_DISPLAY_NAME)
|
if (client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_SERVER_DISPLAY_NAME)
|
||||||
writeStringBinary(host_name, *out);
|
writeStringBinary(server_display_name, *out);
|
||||||
if (client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_VERSION_PATCH)
|
if (client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_VERSION_PATCH)
|
||||||
writeVarUInt(VERSION_PATCH, *out);
|
writeVarUInt(VERSION_PATCH, *out);
|
||||||
if (client_tcp_protocol_version >= DBMS_MIN_PROTOCOL_VERSION_WITH_PASSWORD_COMPLEXITY_RULES)
|
if (client_tcp_protocol_version >= DBMS_MIN_PROTOCOL_VERSION_WITH_PASSWORD_COMPLEXITY_RULES)
|
||||||
|
@ -147,8 +147,8 @@ public:
|
|||||||
* because it allows to check the IP ranges of the trusted proxy.
|
* because it allows to check the IP ranges of the trusted proxy.
|
||||||
* Proxy-forwarded (original client) IP address is used for quota accounting if quota is keyed by forwarded IP.
|
* Proxy-forwarded (original client) IP address is used for quota accounting if quota is keyed by forwarded IP.
|
||||||
*/
|
*/
|
||||||
TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, bool parse_proxy_protocol_, std::string host_name_, const ProfileEvents::Event & read_event_ = ProfileEvents::end(), const ProfileEvents::Event & write_event_ = ProfileEvents::end());
|
TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, bool parse_proxy_protocol_, std::string server_display_name_, const ProfileEvents::Event & read_event_ = ProfileEvents::end(), const ProfileEvents::Event & write_event_ = ProfileEvents::end());
|
||||||
TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, TCPProtocolStackData & stack_data, std::string host_name_, const ProfileEvents::Event & read_event_ = ProfileEvents::end(), const ProfileEvents::Event & write_event_ = ProfileEvents::end());
|
TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, TCPProtocolStackData & stack_data, std::string server_display_name_, const ProfileEvents::Event & read_event_ = ProfileEvents::end(), const ProfileEvents::Event & write_event_ = ProfileEvents::end());
|
||||||
~TCPHandler() override;
|
~TCPHandler() override;
|
||||||
|
|
||||||
void run() override;
|
void run() override;
|
||||||
@ -224,7 +224,7 @@ private:
|
|||||||
ProfileEvents::ThreadIdToCountersSnapshot last_sent_snapshots;
|
ProfileEvents::ThreadIdToCountersSnapshot last_sent_snapshots;
|
||||||
|
|
||||||
/// It is the name of the server that will be sent to the client.
|
/// It is the name of the server that will be sent to the client.
|
||||||
String host_name;
|
String server_display_name;
|
||||||
|
|
||||||
void runImpl();
|
void runImpl();
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ private:
|
|||||||
IServer & server;
|
IServer & server;
|
||||||
bool parse_proxy_protocol = false;
|
bool parse_proxy_protocol = false;
|
||||||
LoggerPtr log;
|
LoggerPtr log;
|
||||||
std::string host_name;
|
std::string server_display_name;
|
||||||
|
|
||||||
ProfileEvents::Event read_event;
|
ProfileEvents::Event read_event;
|
||||||
ProfileEvents::Event write_event;
|
ProfileEvents::Event write_event;
|
||||||
@ -42,12 +42,7 @@ public:
|
|||||||
, read_event(read_event_)
|
, read_event(read_event_)
|
||||||
, write_event(write_event_)
|
, write_event(write_event_)
|
||||||
{
|
{
|
||||||
const bool use_display_name = server.config().getBool("tcp_use_display_name_as_host_name", false);
|
server_display_name = server.config().getString("display_name", getFQDNOrHostName());
|
||||||
if (use_display_name)
|
|
||||||
host_name = server.config().getString("display_name", "");
|
|
||||||
|
|
||||||
if (!host_name.length())
|
|
||||||
host_name = getFQDNOrHostName();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Poco::Net::TCPServerConnection * createConnection(const Poco::Net::StreamSocket & socket, TCPServer & tcp_server) override
|
Poco::Net::TCPServerConnection * createConnection(const Poco::Net::StreamSocket & socket, TCPServer & tcp_server) override
|
||||||
@ -55,7 +50,7 @@ public:
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
LOG_TRACE(log, "TCP Request. Address: {}", socket.peerAddress().toString());
|
LOG_TRACE(log, "TCP Request. Address: {}", socket.peerAddress().toString());
|
||||||
return new TCPHandler(server, tcp_server, socket, parse_proxy_protocol, host_name, read_event, write_event);
|
return new TCPHandler(server, tcp_server, socket, parse_proxy_protocol, server_display_name, read_event, write_event);
|
||||||
}
|
}
|
||||||
catch (const Poco::Net::NetException &)
|
catch (const Poco::Net::NetException &)
|
||||||
{
|
{
|
||||||
@ -69,7 +64,7 @@ public:
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
LOG_TRACE(log, "TCP Request. Address: {}", socket.peerAddress().toString());
|
LOG_TRACE(log, "TCP Request. Address: {}", socket.peerAddress().toString());
|
||||||
return new TCPHandler(server, tcp_server, socket, stack_data, host_name, read_event, write_event);
|
return new TCPHandler(server, tcp_server, socket, stack_data, server_display_name, read_event, write_event);
|
||||||
}
|
}
|
||||||
catch (const Poco::Net::NetException &)
|
catch (const Poco::Net::NetException &)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user