From 347c99340752f3ed12c80527713c16436267a084 Mon Sep 17 00:00:00 2001
From: MICHAEL JACKSON <mj@mjackson.me>
Date: Sat, 17 Feb 2018 20:21:19 -0800
Subject: [PATCH] Move Redis client to utils/redis

---
 server/AuthAPI.js                           | 3 ++-
 server/BlacklistAPI.js                      | 2 +-
 server/StatsAPI.js                          | 2 +-
 server/ingestLogs.js                        | 4 ++--
 server/middleware/utils/createCache.js      | 2 +-
 server/middleware/utils/incrementCounter.js | 2 +-
 server/{RedisClient.js => utils/redis.js}   | 0
 7 files changed, 8 insertions(+), 7 deletions(-)
 rename server/{RedisClient.js => utils/redis.js} (100%)

diff --git a/server/AuthAPI.js b/server/AuthAPI.js
index 931efa3..6331d5c 100644
--- a/server/AuthAPI.js
+++ b/server/AuthAPI.js
@@ -4,7 +4,8 @@ const crypto = require("crypto");
 const jwt = require("jsonwebtoken");
 const invariant = require("invariant");
 const forge = require("node-forge");
-const db = require("./RedisClient");
+
+const db = require("./utils/redis");
 
 let keys;
 if (process.env.NODE_ENV === "production") {
diff --git a/server/BlacklistAPI.js b/server/BlacklistAPI.js
index e1d9d6f..16516ff 100644
--- a/server/BlacklistAPI.js
+++ b/server/BlacklistAPI.js
@@ -1,4 +1,4 @@
-const db = require("./RedisClient");
+const db = require("./utils/redis");
 
 const BlacklistSet = "blacklisted-packages";
 
diff --git a/server/StatsAPI.js b/server/StatsAPI.js
index edb8a10..90adbaa 100644
--- a/server/StatsAPI.js
+++ b/server/StatsAPI.js
@@ -1,4 +1,4 @@
-const db = require("./RedisClient");
+const db = require("./utils/redis");
 const CloudflareAPI = require("./CloudflareAPI");
 const BlacklistAPI = require("./BlacklistAPI");
 
diff --git a/server/ingestLogs.js b/server/ingestLogs.js
index 7e872e6..de2dce9 100644
--- a/server/ingestLogs.js
+++ b/server/ingestLogs.js
@@ -5,14 +5,14 @@ const parsePackageURL = require("./utils/parsePackageURL");
 const CloudflareAPI = require("./CloudflareAPI");
 const StatsAPI = require("./StatsAPI");
 
-const db = require("./RedisClient");
+const db = require("./utils/redis");
 
 /**
  * Domains we want to analyze.
  */
 const DomainNames = [
   "unpkg.com"
-  //'npmcdn.com' // We don't have log data on npmcdn.com yet :/
+  //"npmcdn.com" // We don't have log data on npmcdn.com yet :/
 ];
 
 /**
diff --git a/server/middleware/utils/createCache.js b/server/middleware/utils/createCache.js
index 0f4272e..f234b82 100644
--- a/server/middleware/utils/createCache.js
+++ b/server/middleware/utils/createCache.js
@@ -1,4 +1,4 @@
-const db = require("../../RedisClient");
+const db = require("../../utils/redis");
 
 function createCache(keyPrefix) {
   function createKey(key) {
diff --git a/server/middleware/utils/incrementCounter.js b/server/middleware/utils/incrementCounter.js
index bf172fa..90d2bd5 100644
--- a/server/middleware/utils/incrementCounter.js
+++ b/server/middleware/utils/incrementCounter.js
@@ -1,4 +1,4 @@
-const db = require("../../RedisClient");
+const db = require("../../utils/redis");
 
 function incrementCounter(counter, key, by) {
   return new Promise((resolve, reject) => {
diff --git a/server/RedisClient.js b/server/utils/redis.js
similarity index 100%
rename from server/RedisClient.js
rename to server/utils/redis.js