amirho/nest
1
0
Fork 0
mirror of https://github.com/nestjs/nest.git synced 2026-02-21 23:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(): resolve merge conflicts

Browse Source
This commit is contained in:
Kamil Myśliwiec
2020-11-02 10:59:39 +01:00
parent ca0a6abd18 009d99908b
commit 03f500d867
157 changed files with 190431 additions and 19181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/microservices/server/server-kafka.ts
View File

@@ -10,6 +10,7 @@ import {
import { KafkaContext } from '../ctx-host';
import { KafkaHeaders, Transport } from '../enums';
import {
BrokersFunction,
Consumer,
ConsumerConfig,
EachMessagePayload,
@@ -38,7 +39,7 @@ export class ServerKafka extends Server implements CustomTransportStrategy {
protected consumer: Consumer = null;
protected producer: Producer = null;
protected brokers: string[];
protected brokers: string[] | BrokersFunction;
protected clientId: string;
protected groupId: string;
@@ -55,8 +56,11 @@ export class ServerKafka extends Server implements CustomTransportStrategy {
// append a unique id to the clientId and groupId
// so they don't collide with a microservices client
this.clientId =
(clientOptions.clientId || KAFKA_DEFAULT_CLIENT) + '-server';
this.groupId = (consumerOptions.groupId || KAFKA_DEFAULT_GROUP) + '-server';
(clientOptions.clientId || KAFKA_DEFAULT_CLIENT) +
(clientOptions.clientIdPostfix || '-server');
this.groupId =
(consumerOptions.groupId || KAFKA_DEFAULT_GROUP) +
(clientOptions.clientIdPostfix || '-server');
kafkaPackage = this.loadPackage('kafkajs', ServerKafka.name, () =>
require('kafkajs'),