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 conflicts

Browse Source
This commit is contained in:
Kamil Myśliwiec
2021-05-14 15:36:22 +02:00
parent b36a147cef 209e44a12c
commit 6043520084
117 changed files with 25663 additions and 27941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/microservices/client/client-redis.ts
View File

@@ -30,7 +30,9 @@ export class ClientRedis extends ClientProxy {
constructor(protected readonly options: RedisOptions['options']) {
super();
this.url = this.getOptionsProp(options, 'url') || REDIS_DEFAULT_URL;
this.url =
this.getOptionsProp(options, 'url') ||
(!this.getOptionsProp(options, 'host') && REDIS_DEFAULT_URL);
redisPackage = loadPackage('redis', ClientRedis.name, () =>
require('redis'),