diff --git a/src/utils/redis.ts b/src/utils/redis.ts index a310e69..3144ae6 100644 --- a/src/utils/redis.ts +++ b/src/utils/redis.ts @@ -2,18 +2,15 @@ import {config} from '../config'; import {Logger} from './logger'; import redis, {Callback} from 'redis'; -let get, set; +let exportObject = { + get: (key: string, callback?: Callback) => callback(null, undefined), + set: (key: string, value: string, callback?: Callback) => callback(null, undefined) +}; + if (config.redis) { Logger.info('Connected to redis'); const client = redis.createClient(config.redis); - get = client.get; - set = client.set; -} else { - get = (key: string, callback?: Callback) => callback(null, undefined); - set = (key: string, value: string, callback?: Callback) => callback(null, undefined); + exportObject = client; } -export { - get, - set, -}; +export default exportObject; diff --git a/src/utils/youtubeApi.ts b/src/utils/youtubeApi.ts index 690bfbc..0929baf 100644 --- a/src/utils/youtubeApi.ts +++ b/src/utils/youtubeApi.ts @@ -1,6 +1,6 @@ import {config} from '../config'; import {Logger} from './logger'; -import * as redis from './redis'; +import redis from './redis'; // @ts-ignore import _youTubeAPI from 'youtube-api'; @@ -18,7 +18,7 @@ export class YouTubeAPI { } const redisKey = "youtube.video." + videoID; - redis.get(redisKey, (getErr: string, result: string) => { + redis.get(redisKey, (getErr, result) => { if (getErr || !result) { Logger.debug("redis: no cache for video information: " + videoID); _youTubeAPI.videos.list({ @@ -28,9 +28,9 @@ export class YouTubeAPI { if (!ytErr) { // Only set cache if data returned if (data.items.length > 0) { - redis.set(redisKey, JSON.stringify(data), (setErr: string) => { + redis.set(redisKey, JSON.stringify(data), (setErr) => { if (setErr) { - Logger.warn(setErr); + Logger.warn(setErr.message); } else { Logger.debug("redis: video information cache set for: " + videoID); } @@ -45,7 +45,7 @@ export class YouTubeAPI { }); } else { Logger.debug("redis: fetched video information from cache: " + videoID); - callback(getErr, JSON.parse(result)); + callback(getErr.message, JSON.parse(result)); } }); };