From 488bb7f1182ef3268d13638eb8b8392e4ac3a43d Mon Sep 17 00:00:00 2001 From: trod Date: Thu, 24 Sep 2020 14:03:17 +0200 Subject: [PATCH 1/3] Changes for docker --- .env | 2 +- src/app.module.ts | 2 +- src/log-receiver/log-receiver.service.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.env b/.env index bfd7d6c..219f4b2 100644 --- a/.env +++ b/.env @@ -18,4 +18,4 @@ ID_CPU_MONITOR= ID_RESPONSE_MONITOR= ID_ISSUE_CREATOR= ID_BACKEND_API= -KAFKA_URL=localhost:9092 \ No newline at end of file +KAFKA_URL=kafka:9092 \ No newline at end of file diff --git a/src/app.module.ts b/src/app.module.ts index aa53134..a4c5f56 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -11,7 +11,7 @@ import { ConfigModule } from '@nestjs/config'; @Module({ imports: [ HttpModule, - MongooseModule.forRoot('mongodb://localhost:27017/logDatabase'), + MongooseModule.forRoot('mongodb://db:27017/logDatabase'), MongooseModule.forFeature([ { name: 'logs', schema: LogsSchema }, { name: 'service', schema: ServiceSchema } diff --git a/src/log-receiver/log-receiver.service.ts b/src/log-receiver/log-receiver.service.ts index 363b6bf..c37ebf5 100644 --- a/src/log-receiver/log-receiver.service.ts +++ b/src/log-receiver/log-receiver.service.ts @@ -63,7 +63,7 @@ export class LogReceiverService implements OnModuleInit { ); this.kafkaUrl = this.configService.get( 'KAFKA_URL', - 'localhost:9092', + '1.1.1.1:9092', ); (this.kafka = new Kafka({ clientId: 'issue-creator', From fa7d78282db52eb6b099467e5709d44df4b4ebb3 Mon Sep 17 00:00:00 2001 From: trod Date: Mon, 28 Sep 2020 11:39:35 +0200 Subject: [PATCH 2/3] Fixed messages from not registered services staying in the MQ --- src/log-receiver/log-receiver.service.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/log-receiver/log-receiver.service.ts b/src/log-receiver/log-receiver.service.ts index c37ebf5..e7346f1 100644 --- a/src/log-receiver/log-receiver.service.ts +++ b/src/log-receiver/log-receiver.service.ts @@ -221,6 +221,9 @@ export class LogReceiverService implements OnModuleInit { /** * Connecting to kafka instance and begin consuming * incoming messages are saved to the collection logs in the mongodb + * + * If error status is 401 or 406 message is from not registered service + * then message is discarded, else error is thrown again and the message stays in the MQ * * Consumer is subscribed to the logs topic at the kafka instance */ @@ -232,7 +235,15 @@ export class LogReceiverService implements OnModuleInit { eachMessage: async ({ topic, partition, message }) => { if (message.value != null) { const log: LogMessageFormat = JSON.parse(message.value.toString()); - await this.handleLogMessage(log); + try { + await this.handleLogMessage(log); + } catch (error) { + if (error.status === 401 || 406) { + console.error(error) + } else { + throw error + } + } } }, }); From 3bbd1d1ee0fb9a5192e1ce69e78b05f3b104270a Mon Sep 17 00:00:00 2001 From: Marcel Wolkober Date: Wed, 30 Sep 2020 11:46:46 +0200 Subject: [PATCH 3/3] fixed thrown error --- src/issue-creator/issue-reporter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/issue-creator/issue-reporter.ts b/src/issue-creator/issue-reporter.ts index 40d0147..457994e 100644 --- a/src/issue-creator/issue-reporter.ts +++ b/src/issue-creator/issue-reporter.ts @@ -36,7 +36,7 @@ export abstract class IssueReporter { console.log("CREATED ISSUE", issueID); return issueID; } catch (error) { - throw new Error(error); + console.log(error); } }