1.0.25

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojoio/elasticsearch",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojoio/elasticsearch",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "private": false,
   "description": "log to elasticsearch in a kibana compatible format",
   "main": "dist/index.js",

ts/elasticsearch.classes.elasticindex.ts

@@ -23,20 +23,62 @@ export class ElasticIndex {
         format: 'json',
         bytes: 'm'
       },
-      async (err, response: any[]) => {
+      async (err, responseArg: any[]) => {
+        if(err) {
+          console.log(err);
+          return;
+        }
+
         // lets delete indexes that violate the retention
-        const filteredIndices = response.filter(indexObjectArg => {
+        if(Array.isArray(responseArg)) {
+          const filteredIndices = responseArg.filter(indexObjectArg => {
             return indexObjectArg.index.startsWith('smartlog');
           });
           const filteredIndexNames = filteredIndices.map(indexObjectArg => {
             return indexObjectArg.index;
           });
+          this.deleteOldIndices(filteredIndexNames);
+        }
+
+        let index = null;
+        
+        if(Array.isArray(responseArg)) {
+          index = responseArg.find(indexObject => {
+            return indexObject.index === indexArg;
+          });
+        }
+
+        if (!index) {
+          const done2 = plugins.smartpromise.defer();
+          this.elasticSearchRef.client.indices.create(
+            {
+              waitForActiveShards: '2',
+              index: indexArg
+            },
+            (error, response) => {
+              // console.lof(response)
+              done2.resolve();
+            }
+          );
+          await done2.promise;
+        }
+        this.stringmap.addString(indexArg);
+        done.resolve();
+      }
+    );
+    await done.promise;
+  }
+
+  public createNewIndex(indexNameArg: string) {
+
+  }
+
+  public async deleteOldIndices(indicesArray: string[]) {
     const todayAsUnix: number = Date.now();
         const rententionPeriodAsUnix: number = plugins.smarttime.units.days(
           this.elasticSearchRef.indexRetention
         );
-        console.log(filteredIndexNames);
+    for (const indexName of indicesArray) {
-        for (const indexName of filteredIndexNames) {
       const regexResult = /^smartlog-([0-9]*)\.([0-9]*)\.([0-9]*)$/.exec(indexName);
       const dateAsUnix: number = new Date(
         `${regexResult[1]}-${regexResult[2]}-${regexResult[3]}`
@@ -59,30 +101,5 @@ export class ElasticIndex {
         await done2.promise;
       }
     }
-
-        // console.log(response);
-        const index = response.find(indexObject => {
-          return indexObject.index === indexArg;
-        });
-
-        if (!index) {
-          const done2 = plugins.smartpromise.defer();
-          this.elasticSearchRef.client.indices.create(
-            {
-              waitForActiveShards: '2',
-              index: indexArg
-            },
-            (error, response) => {
-              // console.lof(response)
-              done2.resolve();
-            }
-          );
-          await done2.promise;
-        }
-        this.stringmap.addString(indexArg);
-        done.resolve();
-      }
-    );
-    await done.promise;
   }
 }