From 79742ee4d12eba8d3e0b9f1491f3c69bd443e383 Mon Sep 17 00:00:00 2001 From: Chris Brame Date: Fri, 17 May 2019 01:21:14 -0400 Subject: [PATCH] chore(elasticsearch): indexName --- src/elasticsearch/index.js | 8 +++++++- src/elasticsearch/rebuildIndexChild.js | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/elasticsearch/index.js b/src/elasticsearch/index.js index c76b03bd1..1fbbfd420 100644 --- a/src/elasticsearch/index.js +++ b/src/elasticsearch/index.js @@ -201,7 +201,13 @@ ES.rebuildIndex = function () { var fork = require('child_process').fork var esFork = fork(path.join(__dirname, 'rebuildIndexChild.js'), { - env: { FORK: 1, NODE_ENV: global.env, ELASTICSEARCH_URI: ELASTICSEARCH_URI, MONGODB_URI: global.CONNECTION_URI } + env: { + FORK: 1, + NODE_ENV: global.env, + ELASTICSEARCH_INDEX_NAME: ES.indexName, + ELASTICSEARCH_URI: ELASTICSEARCH_URI, + MONGODB_URI: global.CONNECTION_URI + } }) global.esRebuilding = true diff --git a/src/elasticsearch/rebuildIndexChild.js b/src/elasticsearch/rebuildIndexChild.js index 6cb492487..681a7a915 100644 --- a/src/elasticsearch/rebuildIndexChild.js +++ b/src/elasticsearch/rebuildIndexChild.js @@ -28,6 +28,7 @@ winston.add(winston.transports.Console, { }) var ES = {} +ES.indexName = process.env.ELASTICSEARCH_INDEX_NAME || 'trudesk' function setupTimezone (callback) { var settingsSchema = require('../models/setting') @@ -54,7 +55,6 @@ function setupDatabase (callback) { } function setupClient () { - ES.indexName = process.env.ELASTICSEARCH_INDEX_NAME || 'trudesk' ES.esclient = new elasticsearch.Client({ host: process.env.ELASTICSEARCH_URI, pingTimeout: 10000, @@ -229,7 +229,7 @@ function crawlUsers (callback) { stream .on('data', function (doc) { count += 1 - bulk.push({ index: { _index: 'trudesk', _type: 'doc', _id: doc._id } }) + bulk.push({ index: { _index: ES.indexName, _type: 'doc', _id: doc._id } }) bulk.push({ datatype: 'user', username: doc.username,