chore(elasticsearch): indexName

polonel · May 23, 2019 · 1b4d699 · 1b4d699
1 parent e320e83
commit 1b4d699
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/elasticsearch/index.js b/src/elasticsearch/index.js
@@ -23,6 +23,7 @@ var moment = require('moment-timezone')
 var settingUtil = require('../settings/settingsUtil')
 
 var ES = {}
+ES.indexName = process.env.ELASTICSEARCH_INDEX_NAME || 'trudesk'
 
 function checkConnection (callback) {
   if (!ES.esclient) return callback('Elasticsearch client not initialized. Restart Trudesk!')
@@ -40,7 +41,7 @@ function checkConnection (callback) {
 }
 
 ES.testConnection = function (callback) {
-  if (process.env.ELATICSEARCH_URI) ES.host = process.env.ELATICSEARCH_URI
+  if (process.env.ELEASTICSEARCH_URI) ES.host = process.env.ELEASTICSEARCH_URI
   else ES.host = nconf.get('elasticsearch:host') + ':' + nconf.get('elasticsearch:port')
 
   ES.esclient = new elasticsearch.Client({
@@ -57,7 +58,7 @@ ES.setupHooks = function () {
 
     ES.esclient.index(
       {
-        index: 'trudesk',
+        index: ES.indexName,
         type: 'ticket',
         id: data._id.toString(),
         refresh: 'true',
@@ -103,7 +104,7 @@ ES.setupHooks = function () {
 
       ES.esclient.index(
         {
-          index: 'trudesk',
+          index: ES.indexName,
           type: 'doc',
           id: ticket._id.toString(),
           refresh: 'true',
@@ -154,7 +155,7 @@ ES.setupHooks = function () {
 
       ES.esclient.index(
         {
-          index: 'trudesk',
+          index: ES.indexName,
           type: 'doc',
           id: _id,
           body: cleanedTicket
@@ -226,7 +227,7 @@ ES.getIndexCount = function (callback) {
 
   ES.esclient.count(
     {
-      index: 'trudesk'
+      index: ES.indexName
     },
     callback
   )

diff --git a/src/migration/index.js b/src/migration/index.js
@@ -63,7 +63,7 @@ function getDatabaseVersion (callback) {
   SettingsSchema.getSettingByName('gen:version', function (err, setting) {
     if (err) return callback(err)
 
-    if (!setting) throw new Error('Please upgrade to v1.0.7+ Exiting...')
+    if (!setting) throw new Error('Please upgrade to v1.0.7 Exiting...')
 
     return callback(null, setting.value)
   })
@@ -207,7 +207,7 @@ migrations.run = function (callback) {
           databaseVersion = dbVer
 
           if (semver.satisfies(databaseVersion, '<1.0.10')) {
-            throw new Error('Please upgrade to v1.0.10+ Exiting...')
+            throw new Error('Please upgrade to v1.0.10 Exiting...')
           }
           return next()
         })