Allow the connection timeout to be configured on a per-server basis. Fixes #3388

web/pgadmin/browser/server_groups/servers/__init__.py

@@ -480,6 +480,7 @@ class ServerNode(PGChildNodeView):
             'bgcolor': 'bgcolor',
             'fgcolor': 'fgcolor',
             'service': 'service',
+            'connect_timeout': 'connect_timeout',
             'use_ssh_tunnel': 'use_ssh_tunnel',
             'tunnel_host': 'tunnel_host',
             'tunnel_port': 'tunnel_port',
@@ -672,6 +673,8 @@ class ServerNode(PGChildNodeView):
                 'sslcompression': True if is_ssl and server.sslcompression
                 else False,
                 'service': server.service if server.service else None,
+                'connect_timeout':
+                    server.connect_timeout if server.connect_timeout else 0,
                 'use_ssh_tunnel': server.use_ssh_tunnel
                 if server.use_ssh_tunnel else 0,
                 'tunnel_host': server.tunnel_host if server.tunnel_host
@@ -755,6 +758,7 @@ class ServerNode(PGChildNodeView):
                 bgcolor=data.get('bgcolor', None),
                 fgcolor=data.get('fgcolor', None),
                 service=data.get('service', None),
+                connect_timeout=data.get('connect_timeout', 0),
                 use_ssh_tunnel=data.get('use_ssh_tunnel', 0),
                 tunnel_host=data.get('tunnel_host', None),
                 tunnel_port=data.get('tunnel_port', 22),

web/pgadmin/browser/server_groups/servers/static/js/server.js

@@ -627,6 +627,7 @@ define('pgadmin.node.server', [
           tunnel_identity_file: undefined,
           tunnel_password: undefined,
           tunnel_authentication: 0,
+          connect_timeout: 0,
         },
         // Default values!
         initialize: function(attrs, args) {
@@ -888,6 +889,11 @@ define('pgadmin.node.server', [
           id: 'service', label: gettext('Service'), type: 'text',
           mode: ['properties', 'edit', 'create'], disabled: 'isConnected',
           group: gettext('Connection'),
+        },{
+          id: 'connect_timeout', label: gettext('Connection timeout (seconds)'),
+          type: 'int', group: gettext('Advanced'),
+          mode: ['properties', 'edit', 'create'], disabled: 'isConnected',
+          min: 0,
         }],
         validate: function() {
           const validateModel = new modelValidation.ModelValidation(this);

web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_connect_timeout.py

@@ -0,0 +1,47 @@
+##########################################################################
+#
+# pgAdmin 4 - PostgreSQL Tools
+#
+# Copyright (C) 2013 - 2018, The pgAdmin Development Team
+# This software is released under the PostgreSQL Licence
+#
+##########################################################################
+
+import json
+
+from pgadmin.utils.route import BaseTestGenerator
+from regression.python_test_utils import test_utils as utils
+
+
+class ServersWithConnectTimeoutAddTestCase(BaseTestGenerator):
+    """ This class will add the servers under default server group. """
+
+    scenarios = [
+        # Fetch the default url for server object
+        (
+            'Default Server Node url', dict(
+                url='/browser/server/obj/'
+            )
+        )
+    ]
+
+    def setUp(self):
+        pass
+
+    def runTest(self):
+        """ This function will add the server under default server group."""
+        url = "{0}{1}/".format(self.url, utils.SERVER_GROUP)
+        # Add service name in the config
+        self.server['connect_timeout'] = 5
+        response = self.tester.post(
+            url,
+            data=json.dumps(self.server),
+            content_type='html/json'
+        )
+        self.assertEquals(response.status_code, 200)
+        response_data = json.loads(response.data.decode('utf-8'))
+        self.server_id = response_data['node']['_id']
+
+    def tearDown(self):
+        """This function delete the server from SQLite """
+        utils.delete_server_with_api(self.tester, self.server_id)