Merge branch 'develop' into bugfix/442

pkarw · web-flow · commit 542a05008df4 · 2020-06-19T10:04:50.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,8 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- add error status code as number in `apiError` - @gibkigonzo (#442)
-
+- AAdd error status code as number in `apiError` - @gibkigonzo (#442)
+- Get proper tax calculation for multistore - @didkan (#464)
+- Create only one ES client instance per app - @gibkigonzo (#393)
 
 ## [1.12.0] - 2020.06.01
 
diff --git a/src/lib/elastic.js b/src/lib/elastic.js
@@ -73,6 +73,7 @@ function getHits (result) {
   }
 }
 
+let esClient = null
 function getClient (config) {
   let { host, port, protocol, apiVersion, requestTimeout } = config.elasticsearch
   const node = `${protocol}://${host}:${port}`
@@ -83,7 +84,11 @@ function getClient (config) {
     auth = { username: user, password }
   }
 
-  return new es.Client({ node, auth, apiVersion, requestTimeout })
+  if (!esClient) {
+    esClient = new es.Client({ node, auth, apiVersion, requestTimeout })
+  }
+
+  return esClient
 }
 
 function putAlias (db, originalName, aliasName, next) {

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ function getHits (result) {`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
	`76`	`+let esClient = null`
`76`	`77`	`function getClient (config) {`
`77`	`78`	`let { host, port, protocol, apiVersion, requestTimeout } = config.elasticsearch`
`78`	`79`	const node = `${protocol}://${host}:${port}`
`@@ -83,7 +84,11 @@ function getClient (config) {`
`83`	`84`	`auth = { username: user, password }`
`84`	`85`	`}`
`85`	`86`
`86`		`- return new es.Client({ node, auth, apiVersion, requestTimeout })`
	`87`	`+ if (!esClient) {`
	`88`	`+ esClient = new es.Client({ node, auth, apiVersion, requestTimeout })`
	`89`	`+ }`
	`90`	`+`
	`91`	`+ return esClient`
`87`	`92`	`}`
`88`	`93`
`89`	`94`	`function putAlias (db, originalName, aliasName, next) {`