From b208a3b8bdf69aa4fbca74ebb8ca0a8b73b3df02 Mon Sep 17 00:00:00 2001 From: Benjin Dubishar Date: Thu, 20 Feb 2025 21:10:07 -0800 Subject: [PATCH] Updating connect timeout from 15 to 30 seconds (#18593) * Updating connect timeout from 15 to 30 seconds * loc --- localization/xliff/vscode-mssql.xlf | 2 +- package.json | 2 +- package.nls.json | 2 +- src/connectionconfig/connectionDialogWebviewController.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/localization/xliff/vscode-mssql.xlf b/localization/xliff/vscode-mssql.xlf index 764c240e3b..5a42eca8fc 100644 --- a/localization/xliff/vscode-mssql.xlf +++ b/localization/xliff/vscode-mssql.xlf @@ -2059,7 +2059,7 @@ [Optional] Specify the length of time in seconds to wait for a command to execute before terminating the attempt and generating an error. The default value is 30 seconds. - [Optional] Specify the length of time in seconds to wait for a connection to the server before terminating connection attempt and generating an error. The default value is 15 seconds for on-premise and 30 seconds for Azure SQL Database connections. + [Optional] Specify the length of time in seconds to wait for a connection to the server before terminating connection attempt and generating an error. The default value is 30 seconds. [Optional] Specify the maximum number of connections allowed in the pool. diff --git a/package.json b/package.json index 1aef08bc47..a3277078b6 100644 --- a/package.json +++ b/package.json @@ -1103,7 +1103,7 @@ }, "connectTimeout": { "type": "number", - "default": 15, + "default": 30, "description": "%mssql.connection.connectTimeout%" }, "commandTimeout": { diff --git a/package.nls.json b/package.nls.json index 7261976704..3d9ca38023 100644 --- a/package.nls.json +++ b/package.nls.json @@ -57,7 +57,7 @@ "mssql.connection.trustServerCertificate":"[Optional] When set to 'true', the SQL Server SSL certificate is automatically trusted when the communication layer is encrypted using SSL. Set 'false' for Azure SQL Database connection.", "mssql.connection.hostNameInCertificate":"[Optional] When specified (and encrypt=Mandatory and trustServerCertificate=false), SQL Server uses provided hostname for validating trust with the server certificate.", "mssql.connection.persistSecurityInfo":"[Optional] When set to false, security-sensitive information, such as the password, is not returned as part of the connection if the connection is open or has ever been in an open state.", -"mssql.connection.connectTimeout":"[Optional] Specify the length of time in seconds to wait for a connection to the server before terminating connection attempt and generating an error. The default value is 15 seconds for on-premise and 30 seconds for Azure SQL Database connections.", +"mssql.connection.connectTimeout":"[Optional] Specify the length of time in seconds to wait for a connection to the server before terminating connection attempt and generating an error. The default value is 30 seconds.", "mssql.connection.commandTimeout":"[Optional] Specify the length of time in seconds to wait for a command to execute before terminating the attempt and generating an error. The default value is 30 seconds.", "mssql.connection.connectRetryCount":"[Optional] Specify the number of attempts to restore connection.", "mssql.connection.connectRetryInterval":"[Optional] Specify the delay between attempts to restore connection.", diff --git a/src/connectionconfig/connectionDialogWebviewController.ts b/src/connectionconfig/connectionDialogWebviewController.ts index 04afcbac8c..418e395e41 100644 --- a/src/connectionconfig/connectionDialogWebviewController.ts +++ b/src/connectionconfig/connectionDialogWebviewController.ts @@ -891,7 +891,7 @@ export class ConnectionDialogWebviewController extends ReactWebviewPanelControll private async loadEmptyConnection() { const emptyConnection = { authenticationType: AuthenticationType.SqlLogin, - connectTimeout: 15, // seconds + connectTimeout: 30, // seconds applicationName: "vscode-mssql", } as IConnectionDialogProfile; this.state.connectionProfile = emptyConnection;