fix: disabling redis TLS does not work. (#52)

src/cache/client.ts

@@ -16,22 +16,26 @@ export const getCacheConfig = (): RedisConnectOptions => ({
  tls: Config.REDIS_TLS,
 })
 
-let instance: CacheClient | undefined = undefined
+let mainInstance: CacheClient
+let cacheInstance: CacheClient
 
-export const getCacheClient = async (): Promise<CacheClient> => {
- if (!instance) {
+export const getCacheClient = async (useCache?: boolean): Promise<CacheClient> => {
+ if (!mainInstance) {
  const config = getCacheConfig()
  const { password: _, ...loggableConfig } = config
  debug('config: %o', loggableConfig)
  if (config.hostname) {
- instance = await connect(config)
+ console.log('🚀 Connecting to Cache Client...')
+ mainInstance = await connect(config)
+ cacheInstance = await connect(config)
+ console.log('🚀 Connected to Cache Client.')
  }
  }
 
- return instance
+ return useCache ? cacheInstance : mainInstance
 }
 
 export async function publish(channel: string, message: RedisValue) {
- const client = await getCacheClient()
+ const client = await getCacheClient(true)
  return client.publish(channel, message)
 }

src/config/index.ts

@@ -31,7 +31,13 @@ const Config = {
  REDIS_DB: Number(Deno.env.get('REDIS_DB') || 0),
  REDIS_USER: Deno.env.get('REDIS_USER'),
  REDIS_PASS: Deno.env.get('REDIS_PASS'),
- REDIS_TLS: Boolean(Deno.env.get('REDIS_TLS')),
+ REDIS_TLS: (() => {
+ const tlsEnable = Deno.env.get('REDIS_TLS') as unknown as string
+ if (tlsEnable && ['true', 'false'].includes(tlsEnable)) {
+ return tlsEnable === 'true'
+ }
+ return false
+ })(),
 }
 
 export default Config

src/database/DatabaseWatcher.ts

@@ -74,7 +74,7 @@ export class DatabaseWatcher extends EventEmitter {
  this.changeStream.on('change', this.onChangeStreamChange)
  this.changeStream.on('error', this.onChangeStreamError)
 
- console.log('Using change streams')
+ console.log('✅ Using change streams')
  } catch (err: unknown) {
  console.error(err, 'Change stream error')
 

src/database/client.ts

@@ -6,7 +6,7 @@ import { createLogger } from '../factories/logger-factory.ts'
 const getMasterConfig = () => {
  const mongoUri = Config.MONGO_URI
  if (!mongoUri) {
- console.error('mongoUri not exit please export MONGO_URI env')
+ console.error('🚨 You may have entered an incorrect MONGO_URI environment variable.')
  return Deno.exit(1)
  }
 
@@ -36,10 +36,10 @@ export const getMasterDbClient = () => {
  retryWrites: true,
  })
  writeClient.on('open', () => {
- console.log('Connected to database. selected db of', writeClient.name)
+ console.log('🚀 Connecting to database. selected db of', writeClient.name)
  })
  writeClient.on('error', () => {
- console.log('Unable to connect to database')
+ console.log('💥 Unable to connect to database')
  })
  }
 
@@ -49,7 +49,7 @@ export const getMasterDbClient = () => {
 const getReadReplicaConfig = () => {
  const mongoUri = Config.MONGO_URI
  if (!mongoUri) {
- console.error('mongoUri not exit please export MONGO_URI env')
+ console.error('🚨 You may have entered an incorrect MONGO_URI environment variable.')
  return Deno.exit(1)
  }
 
@@ -83,10 +83,10 @@ export const getReadReplicaDbClient = () => {
  retryReads: true,
  })
  readClient.on('open', () => {
- console.log('Connected to secondary database. selected db of', readClient.name)
+ console.log('🚀 Connected to secondary database. selected db of', readClient.name)
  })
  readClient.on('error', () => {
- console.log('Unable to connect to secondary database')
+ console.log('💥 Unable to connect to secondary database')
  })
  }