Two phase download

.circleci/config.yml

@@ -69,6 +69,8 @@ jobs:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: quizzes_test
+      - image: circleci/redis:6.0.8-alpine
+
     steps:
       - checkout
       - run:
@@ -81,15 +83,39 @@ jobs:
               sleep 1
             done
             echo Failed waiting for Postgres && exit 1
+      - run:
+          name: "Waiting for Redis to be ready"
+          command: |
+            for i in `seq 1 10`;
+            do
+              nc -z localhost 6379 && echo Success && exit 0
+              echo -n .
+              sleep 1
+            done
+            echo Failed waiting for Redis && exit 1
       - run:
           name: "install dependencies"
           command: cd packages/backendv2 && npm ci
       - run:
           name: "run migrations"
           command: cd packages/backendv2 && export NODE_ENV=test && npx knex migrate:latest
+      - run:
+          name: install dockerize
+          command: wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && sudo tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
+          environment:
+            DOCKERIZE_VERSION: v0.3.0
+      - run:
+          name: Wait for redis
+          command: dockerize -wait tcp://localhost:6379 -timeout 1m
+      - run:
+          name: Wait for db
+          command: dockerize -wait tcp://localhost:5432 -timeout 1m
       - run:
           name: "run tests"
           command: "cd packages/backendv2 && npm run test -- --coverage"
+          environment:
+            REDIS_HOST: localhost
+            REDIS_PORT: 6379
       - run:
           name: "Upload coverage"
           command: "cd packages/backendv2 && bash <(curl -s https://codecov.io/bash)"

packages/backendv2/config/redis.ts

@@ -1,39 +1,18 @@
-import dotenv from "dotenv"
-import redis from "redis"
+import Redis from "ioredis"
 
-import { promisify } from "util"
-
-if (process.env.NODE_ENV !== "production") {
-  dotenv.config({ path: ".env" })
-}
-
-let client = null
-
-/* Create client if variables available */
+let client
 if (process.env.REDIS_HOST && process.env.REDIS_PORT) {
-  client = redis.createClient({
+  client = new Redis({
+    port: Number(process.env.REDIS_PORT),
     host: process.env.REDIS_HOST,
-    port: Number.parseInt(process.env.REDIS_PORT as string, 10),
-    password: process.env.REDIS_PASSWORD && process.env.REDIS_PASSWORD,
-  })
-  client.on("error", err => {
-    console.log(err)
   })
-
-  client.on("connect", () => {
+  if (client) {
     console.log(
-      `Connected to Redis running on - HOST: ${process.env.REDIS_HOST} PORT: ${process.env.REDIS_PORT} `,
+      `Redis client initialized and running on ${process.env.REDIS_HOST}:${process.env.REDIS_PORT}`,
     )
-  })
+  }
+} else {
+  console.log("Redis uninitialized. Configuration missing.")
 }
 
-let get = client ? promisify(client.get).bind(client) : null
-let set = client ? promisify(client.get).bind(client) : null
-let setex = client ? promisify(client.setex).bind(client) : null
-
-export default {
-  client,
-  get,
-  set,
-  setex,
-}
+export default { client }