1.0.26

.gitlab-ci.yml

@@ -37,18 +37,6 @@ snyk:
 # ====================
 # test stage
 # ====================
-testLEGACY:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install legacy
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-  allow_failure: true
 
 testLTS:
   stage: test
@@ -135,13 +123,3 @@ pages:
     paths:
     - public
   allow_failure: true
-
-windowsCompatibility:
-  image: stefanscherer/node-windows:10-build-tools
-  stage: metadata
-  script:
-  - npm install & npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - windows
-  allow_failure: true

package-lock.json

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

package.json

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

ts/elasticsearch.classes.elasticindex.ts

@@ -23,50 +23,37 @@ export class ElasticIndex {
         format: 'json',
         bytes: 'm'
       },
-      async (err, response: any[]) => {
+      async (err, responseArg: any[]) => {
-        // lets delete indexes that violate the retention
+        if(err) {
-        const filteredIndices = response.filter(indexObjectArg => {
+          console.log(err);
-          return indexObjectArg.index.startsWith('smartlog');
+          return;
-        });
-        const filteredIndexNames = filteredIndices.map(indexObjectArg => {
-          return indexObjectArg.index;
-        });
-        const todayAsUnix: number = Date.now();
-        const rententionPeriodAsUnix: number = plugins.smarttime.units.days(
-          this.elasticSearchRef.indexRetention
-        );
-        console.log(filteredIndexNames);
-        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]}`
-          ).getTime();
-          if (todayAsUnix - rententionPeriodAsUnix > dateAsUnix) {
-            console.log(`found old index ${indexName}`);
-            const done2 = plugins.smartpromise.defer();
-            this.elasticSearchRef.client.indices.delete({
-              index: indexName
-            }, (err2, response2) => {
-              if(err2) {
-                console.log(err2);
-              }
-              console.log(`deleted ${indexName}`);
-              done2.resolve();
-            });
-            await done2.promise;
-          }
         }
 
-        // console.log(response);
+        // lets delete indexes that violate the retention
-        const index = response.find(indexObject => {
+        if(Array.isArray(responseArg)) {
-          return indexObject.index === indexArg;
+          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',
+              
+              waitForActiveShards: '1',
               index: indexArg
             },
             (error, response) => {
@@ -82,4 +69,38 @@ export class ElasticIndex {
     );
     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
+        );
+    for (const indexName of indicesArray) {
+      const regexResult = /^smartlog-([0-9]*)\.([0-9]*)\.([0-9]*)$/.exec(indexName);
+      const dateAsUnix: number = new Date(
+        `${regexResult[1]}-${regexResult[2]}-${regexResult[3]}`
+      ).getTime();
+      if (todayAsUnix - rententionPeriodAsUnix > dateAsUnix) {
+        console.log(`found old index ${indexName}`);
+        const done2 = plugins.smartpromise.defer();
+        this.elasticSearchRef.client.indices.delete(
+          {
+            index: indexName
+          },
+          (err2, response2) => {
+            if (err2) {
+              console.log(err2);
+            }
+            console.log(`deleted ${indexName}`);
+            done2.resolve();
+          }
+        );
+        await done2.promise;
+      }
+    }
+  }
 }

ts/elasticsearch.classes.elasticsearch.ts

@@ -35,7 +35,7 @@ export class ElasticSearch<T> {
    */
   constructor(optionsArg: IElasticSearchConstructorOptions) {
     this.client = new ElasticClient({
-      host: this.computeHostString(optionsArg),
+      host: this.computeHostString(optionsArg)
       // log: 'trace'
     });
     this.indexPrefix = optionsArg.indexPrefix;
@@ -61,10 +61,10 @@ export class ElasticSearch<T> {
 
   public async log(logPackageArg: ILogPackage, scheduleOverwrite = false) {
     const now = new Date();
-    const indexToUse = `${this.indexPrefix}-${now.getFullYear()}.${('0' + (now.getMonth() + 1)).slice(-2)}.${(
+    const indexToUse = `${this.indexPrefix}-${now.getFullYear()}.${(
-      '0' + now.getDate()
+      '0' +
-    ).slice(-2)}`;
+      (now.getMonth() + 1)
-
+    ).slice(-2)}.${('0' + now.getDate()).slice(-2)}`;
 
     if (this.elasticScheduler.docsScheduled && !scheduleOverwrite) {
       this.elasticScheduler.scheduleDoc(logPackageArg);
@@ -94,11 +94,11 @@ export class ElasticSearch<T> {
     );
   }
 
-  get logDestination (): ILogDestination {
+  get logDestination(): ILogDestination {
     return {
       handleLog: (smartlogPackageArg: ILogPackage) => {
         this.log(smartlogPackageArg);
       }
-    }
+    };
   }
 }