Skip to content
This repository was archived by the owner on May 28, 2023. It is now read-only.

Commit 681d726

Browse files
committed
Minor fixes - memory limits
1 parent 5590e2e commit 681d726

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

docker-compose.elastic7.yml

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ services:
33
es7:
44
container_name: elasticsearch7
55
build: docker/elasticsearch7/
6+
ulimits:
7+
memlock:
8+
soft: -1
9+
hard: -1
610
volumes:
711
- ./docker/elasticsearch7/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro
812
ports:

docker-compose.yml

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ services:
33
es1:
44
container_name: elasticsearch
55
build: docker/elasticsearch/
6+
ulimits:
7+
memlock:
8+
soft: -1
9+
hard: -1
610
volumes:
711
- ./docker/elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro
812
- ./docker/elasticsearch/data:/usr/share/elasticsearch/data

src/lib/elastic.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ function loadSchema (entityType, apiVersion = '7.1') {
191191
let elasticSchema = parseInt(apiVersion) < 6 ? schemaContent : Object.assign({}, { mappings: schemaContent });
192192
const extensionsPath = path.join(__dirname, '../../config/elastic.schema.' + entityType + '.extension.json');
193193
if (fs.existsSync(extensionsPath)) {
194-
schemaContent = jsonFile.readFileSync(extensionsPath)
194+
schemaContent = jsonFile.readFileSync(extensionsPath)
195195
let elasticSchemaExtensions = parseInt(apiVersion) < 6 ? schemaContent : Object.assign({}, { mappings: schemaContent });
196196
elasticSchema = _.merge(elasticSchema, elasticSchemaExtensions) // user extensions
197197
}

0 commit comments

Comments
 (0)