chore(elasticsearch): indexName

polonel · May 23, 2019 · 79742ee · 79742ee
1 parent 9ff2c14
commit 79742ee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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,