auth

Author: alainabbas

docker/docker-compose.yml

@@ -7,8 +7,6 @@ services:
       - "..:/data"
     networks:
       - dev
-    ports:
-      - "9229:9229"
 networks:
   dev: 
     external: true      

src/app.service.ts

@@ -1,9 +1,10 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import { Worker } from 'bullmq';
 import { fdir } from "fdir";
 import * as fs  from "fs";
 import * as YAML from 'yaml'
 import * as process from 'child_process'
+import * as mainProcess from 'process'
 import * as path from 'path'
 import {BackendConfigDto} from "./dto/Backend-config.dto";
 import {BackendResultDto} from "./dto/Backend-result.dto";
@@ -12,20 +13,25 @@ import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class AppService {
+  private readonly logger = new Logger(AppService.name);
   backendsConfig:Array<BackendConfigDto>=[]
+
   constructor(private readonly configService: ConfigService) {}
 
   async runDaemon() {
     await this.loadConfig()
     const backendResults=[]
+
     const worker = new Worker('backend',  async job => {
-      console.log(job.name)
+
       let results=[]
       let gStatus=0;
+      this.logger.log('start daemon')
       for await(const backend of this.backendsConfig) {
         if (backend.active === 1){
+          this.logger.log('Execute backend ' + backend.name)
           var task=backend.actions[job.name]
-          console.log(backend.path +'/bin/'+ task.exec)
+          this.logger.debug(backend.path +'/bin/'+ task.exec)
           const out=process.spawnSync(backend.path +'/bin/'+ task.exec,[],{
             input: JSON.stringify(job.data)
           })
@@ -41,23 +47,32 @@ export class AppService {
           }
         }
       }
-      console.log('fini')
-      console.log(results)
+      this.logger.debug(results)
       return {jobId:job.id,status:gStatus,data:results}
     },{connection:this.configService.get('redis')});
   }
 
   async loadConfig(){
+    this.logger.log('load backends config')
     const crawler = new fdir()
         .withBasePath()
         .filter((path, isDirectory) => path.endsWith(".yml"))
     const files = crawler.crawl(this.configService.get('backendsPath')).sync();
     for await(const element of files) {
       const file = fs.readFileSync(element, 'utf8')
       const config=YAML.parse(file)
+      try{
+        const verif=plainToInstance(BackendConfigDto,config)
+      }catch(e){
+        const erreurs=errors.map((e) => e.toString()).join(', ')
+        this.logger.fatal(`Erreur fichier de configuration : ${element} : ${erreurs}` )
+        mainProcess.exit(1)
+      }
       config.path=path.dirname(element)
       this.backendsConfig.push(config)
+      this.logger.log('Load ' + config.name)
     }
-    console.log (this.backendsConfig)
+    this.logger.debug(this.backendsConfig)
+
   }
 }

src/config.ts

@@ -3,11 +3,10 @@ export default () => ({
         host : process.env.REDIS_HOST || 'localhost',
         port : parseInt(process.env.REDIS_PORT) || 6379,
         user : process.env.REDIS_USER || '',
-        password: process.env.REDIS_PASSWORD ||'',
-        application: {
-            logger: process.env.LOGGER
-        }
+        password: process.env.REDIS_PASSWORD ||''
     },
+    logLevel: process.env.LOG_LEVEL || 'INFO',
     backendsPath: process.env.BACKENDS_PATH || __dirname+'/../backends',
-    nameQueue: process.env.NAME_QUEUE || 'backend'
+    nameQueue: process.env.NAME_QUEUE || 'backend',
+    loglevel: process.env.LOG_LEVEL
 });

src/main.ts

@@ -1,10 +1,36 @@
 import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app.module';
 import { AppService } from './app.service';
+import { LogLevel } from '@nestjs/common'
+import ConfigInstance from './config'
+
+
 
 async function bootstrap() {
-  const app = await NestFactory.createApplicationContext(AppModule);
+  const app = await NestFactory.createApplicationContext(AppModule,{logger: setLogLevel() as LogLevel[]});
   const appService = app.get(AppService);
-  console.log(appService.runDaemon());
+  appService.runDaemon()
+}
+function setLogLevel():Array<string>{
+  let loggerOptions=['error', 'warn','fatal']
+  let configInstance=ConfigInstance()
+  switch(configInstance['logLevel']){
+    case 'fatal' :
+      loggerOptions=['fatal']
+      break;
+    case 'error' :
+      loggerOptions=['error','fatal']
+      break;
+    case 'warn':
+      loggerOptions=['error', 'warn','fatal']
+      break;
+    case 'info' :
+      loggerOptions=['error', 'warn','fatal','log','verbose']
+      break;
+    case 'debug' :
+      loggerOptions=['error', 'warn','fatal','log','verbose','debug']
+      break;
+  }
+  return loggerOptions
 }
 bootstrap();