Add function which gets port from configuration

Author: df530

programs/client/Client.cpp

@@ -486,13 +486,9 @@ void Client::connect()
     {
         DB::DNSResolver::instance().resolveHost(hosts_ports[attempted_address_index].host);
     }
-    bool is_secure = config().getBool("secure", false);
-    String tcp_port_config_key = is_secure ? "tcp_port_secure" : "tcp_port";
-    UInt16 default_port = config().getInt("port",
-        config().getInt(tcp_port_config_key,
-            is_secure ? DBMS_DEFAULT_SECURE_PORT : DBMS_DEFAULT_PORT));
+    UInt16 default_port = ConnectionParameters::getPortFromConfig(config());
     connection_parameters = ConnectionParameters(config(), hosts_ports[0].host,
-        hosts_ports[0].port.value_or(default_port));
+                                                 hosts_ports[0].port.value_or(default_port));
 
     String server_name;
     UInt64 server_version_major = 0;

src/Client/ConnectionParameters.cpp

@@ -69,11 +69,15 @@ ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfigurati
 }
 
 ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfiguration & config)
+{
+    ConnectionParameters(config, config.getString("host", "localhost"), getPortFromConfig(config));
+}
+
+int ConnectionParameters::getPortFromConfig(const Poco::Util::AbstractConfiguration & config)
 {
     bool is_secure = config.getBool("secure", false);
-    std::string connection_host = config.getString("host", "localhost");
-    int connection_port = config.getInt("port",
-        config.getInt(is_secure ? "tcp_port_secure" : "tcp_port", is_secure ? DBMS_DEFAULT_SECURE_PORT : DBMS_DEFAULT_PORT));
-    ConnectionParameters(config, connection_host, connection_port);
+    return config.getInt("port",
+        config.getInt(is_secure ? "tcp_port_secure" : "tcp_port",
+            is_secure ? DBMS_DEFAULT_SECURE_PORT : DBMS_DEFAULT_PORT));
 }
 }

src/Client/ConnectionParameters.h

@@ -25,6 +25,8 @@ struct ConnectionParameters
     ConnectionParameters() {}
     ConnectionParameters(const Poco::Util::AbstractConfiguration & config);
     ConnectionParameters(const Poco::Util::AbstractConfiguration & config, std::string host, int port);
+
+    static int getPortFromConfig(const Poco::Util::AbstractConfiguration & config);
 };
 
 }