factorise worker

Author: lfroment0

src/services/redis-service.ts

@@ -52,7 +52,7 @@ export class RedisService {
     }
 
     async getTask(queueName: string) {
-        return await this.brpopAsync(queueName, 0);
+        return this.brpopAsync(queueName, 0);
     }
 
     deleteAlert(alertKey: string) {

src/worker/exec.ts

@@ -1,20 +1,23 @@
 import { Context, createContext, CreateContextOptions, runInNewContext, RunningScriptOptions } from 'vm';
 import { performance } from 'perf_hooks';
 
+const opt: CreateContextOptions = {
+    name: 'checkId: xxx',
+    codeGeneration: {
+        strings: false
+    },
+};
+
 export function execZmonScript(ctx: Context, script: string, additionalCtx: {value: any} | {entity: Object}) {
     const scriptToExec = `(${script})();`
-    const opt: CreateContextOptions = {
-        name: 'checkId: xxx',
-        codeGeneration: {
-            strings: false
-        },
-    };
 
     const localCtx = {...ctx, ...additionalCtx};
     const newCtx = createContext(localCtx, opt);
 
     const t0 = Date.now();
+
     const result = runInNewContext(scriptToExec, newCtx);
+
     const t1 = Date.now();
 
     return {

src/worker/zmon-worker.ts

@@ -1,14 +1,16 @@
+import { hostname } from 'os';
 import { RedisClient } from 'redis';
 import { Context } from 'vm';
 import { promisify } from 'util';
 
-import execCtx from '../exec-ctx/ctx';
 import { execZmonScript } from './exec';
-import { hostname } from "os";
+import execCtx from '../exec-ctx/ctx';
 import { RedisService } from '../services/redis-service';
 
 
 export default class ZmonWorker {
+    executedChecks = 0;
+
     private execCtx: Context;
     private workerName: string;
 
@@ -27,27 +29,32 @@ export default class ZmonWorker {
     }
 
     private registerWorker() {
-        this.redisService.registerWorker(this.workerName)
+        this.redisService.registerWorker(this.workerName);
     }
 
     async startWorker() {
         console.log('worker started');
         let i = 0;
         while (true) {
-            const res = await this.consumeQueue();
-            const [ _, msg ] = res;
-            const parsedMsg = JSON.parse(msg);
-            const {check_id, entity, command} = parsedMsg.body.args[0];
-            const alertList = parsedMsg.body.args[1];
+            const res: [string, string] = await this.consumeQueue();
+            this.processMessage(res);
+        }
+    }
 
-            const checkResult = this.executeZmonTask(command, check_id, entity);
+    private processMessage(res: [string, string]) {
+        const [_, msg] = res;
+        const parsedMsg = JSON.parse(msg);
+        const {check_id, entity, command} = parsedMsg.body.args[0];
+        const alertList = parsedMsg.body.args[1];
 
-            this.storeCheckResult(check_id, entity.id, JSON.stringify(checkResult));
+        const checkResult = this.executeZmonTask(command, check_id, entity);
+        this.executedChecks++;
 
-            alertList.forEach((alert: any) => {
-                this.handleAlerts(alert, checkResult, entity);
-            });
-        }
+        this.storeCheckResult(check_id, entity.id, JSON.stringify(checkResult));
+
+        alertList.forEach((alert: any) => {
+            this.handleAlerts(alert, checkResult, entity);
+        });
     }
 
     private handleAlerts(alert: any, checkResult: any, entity: any) {
@@ -71,8 +78,8 @@ export default class ZmonWorker {
         }
     }
 
-    private async consumeQueue() {
-        return await this.redisService.getTask(this.queueName);
+    private consumeQueue() {
+        return this.redisService.getTask(this.queueName);
     }
 
     private executeZmonTask(checkScript: string, checkId: string, entity: any): any {