2
0
Эх сурвалжийг харах

only flush redis when running on heroku; don't delete files on start (see @46f36e9fede3984e85cb1cafa7a4fea67a56176d)

jomo 10 жил өмнө
parent
commit
1aeeb19fcf
1 өөрчлөгдсөн 6 нэмэгдсэн , 34 устгасан
  1. 6 34
      modules/cache.js

+ 6 - 34
modules/cache.js

@@ -2,7 +2,8 @@ var config = require("./config");
 var redis = null;
 var redis = null;
 var fs = require("fs");
 var fs = require("fs");
 
 
-// sets up redis connection, calls clear_cache
+// sets up redis connection
+// flushes redis when running on heroku (files aren't kept between pushes)
 function connect_redis() {
 function connect_redis() {
   console.log("connecting to redis...");
   console.log("connecting to redis...");
   if (process.env.REDISCLOUD_URL) {
   if (process.env.REDISCLOUD_URL) {
@@ -14,7 +15,10 @@ function connect_redis() {
   }
   }
   redis.on("ready", function() {
   redis.on("ready", function() {
     console.log("Redis connection established.");
     console.log("Redis connection established.");
-    clear_cache();
+    if(process.env.HEROKU) {
+      console.log("Running on heroku, flushing redis");
+      redis.flushall();
+    }
   });
   });
   redis.on("error", function (err) {
   redis.on("error", function (err) {
     console.error(err);
     console.error(err);
@@ -24,38 +28,6 @@ function connect_redis() {
   });
   });
 }
 }
 
 
-
-// flushes redis, deletes faces + helms
-// useful for heroku, files aren't kept between pushes
-function clear_cache() {
-  console.log("Flushing redis");
-  redis.flushall();
-  console.log("Deleting all faces + helms...");
-  fs.readdir(config.faces_dir, function(err, files) {
-    if (err) {
-      console.error(err);
-    } else {
-      for (var i in files) {
-        var file = files[i];
-        if (file[0] != ".") {
-          // delete face file
-          fs.unlink(config.faces_dir + file, function(err){
-            if (err) {
-              console.error(err);
-            }
-          });
-          // delete helm file, we assume this exists as well
-          fs.unlink(config.helms_dir + file, function(err){
-            if (err) {
-              console.error(err);
-            }
-          });
-        }
-      }
-    }
-  });
-}
-
 // sets the date of the face file belonging to +hash+ to now
 // sets the date of the face file belonging to +hash+ to now
 // the helms file is ignored because we only need 1 file to read/write from
 // the helms file is ignored because we only need 1 file to read/write from
 function update_file_date(hash) {
 function update_file_date(hash) {