From 860e5d483cd952ec833c40312a2141bb3e4ef579 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Mon, 29 May 2017 15:46:35 -0400 Subject: PLT-6341/PLT-6342 Update gorp to mattermost fork and add connection timeout setting (#6410) * Update gorp to mattermost fork and add connection timeout setting * Add go dependency * Rename from connection timeout to query timeout * Properly add gorp dependency --- webapp/i18n/en.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'webapp/i18n') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 04c55d077..fe2a9ae5a 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -818,6 +818,9 @@ "admin.sql.keyTitle": "At Rest Encrypt Key:", "admin.sql.maxConnectionsDescription": "Maximum number of idle connections held open to the database.", "admin.sql.maxConnectionsExample": "E.g.: \"10\"", + "admin.sql.queryTimeoutTitle": "Query Timeout:", + "admin.sql.queryTimeoutDescription": "The number of seconds to wait for a response from the database after opening a connection and sending the query. Errors that you see in the UI or in the logs as a result of a query timeout can vary depending on the type of query. This setting has no effect on PostgreSQL databases.", + "admin.sql.queryTimeoutExample": "E.g.: \"30\"", "admin.sql.maxConnectionsTitle": "Maximum Idle Connections:", "admin.sql.maxOpenDescription": "Maximum number of open connections held open to the database.", "admin.sql.maxOpenExample": "E.g.: \"10\"", -- cgit v1.2.3-1-g7c22