From 5811f38c957caa30a029bfee2e62168b4fa21852 Mon Sep 17 00:00:00 2001
From: Jake <jake0oo0andminecraft@gmail.com>
Date: Sat, 6 Dec 2014 00:43:48 -0600
Subject: [PATCH] Add temporary cleaning solution to renders

---
 modules/cache.js        |  2 +-
 modules/clean_images.js | 16 +++++++++++++---
 modules/helpers.js      |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/modules/cache.js b/modules/cache.js
index c9e4c11..39f9aff 100644
--- a/modules/cache.js
+++ b/modules/cache.js
@@ -16,7 +16,7 @@ function connect_redis() {
   }
   redis.on("ready", function() {
     logging.log("Redis connection established.");
-    if(process.env.HEROKU || true) {
+    if(process.env.HEROKU) {
       logging.log("Running on heroku, flushing redis");
       redis.flushall();
     }
diff --git a/modules/clean_images.js b/modules/clean_images.js
index f3e5501..c8386a5 100644
--- a/modules/clean_images.js
+++ b/modules/clean_images.js
@@ -33,14 +33,24 @@ exp.run = function() {
       logging.error(err);
     } else if (clean) {
       logging.warn("ImageCleaner: Disk limit reached! Cleaning images now");
-      var skindir = __dirname + "/../" + config.faces_dir;
+      var facesdir = __dirname + "/../" + config.faces_dir;
       var helmdir = __dirname + "/../" + config.helms_dir;
-      var files = fs.readdirSync(skindir);
+      var renderdir = __dirname + "/../" + config.renders_dir;
+      var skindir = __dirname + "/../" + config.skins_dir;
+      var files = fs.readdirSync(facesdir);
       for (var i = 0; i < Math.min(files.length, config.cleaning_amount); i++) {
         var filename = files[i];
         if (filename[0] != ".") {
-          fs.unlink(skindir + filename, function(){});
+          fs.unlink(facesdir + filename, function(){});
           fs.unlink(helmdir + filename, function(){});
+          fs.unlink(skindir + filename, function(){});
+        }
+      }
+      files = fs.readdirSync(renderdir);
+      for (var i = 0; i < Math.min(files.length, config.cleaning_amount); i++) {
+        var filename = files[i];
+        if (filename[0] != ".") {
+          fs.unlink(renderdir + filename, function(){});
         }
       }
     } else {
diff --git a/modules/helpers.js b/modules/helpers.js
index a5c9056..9582164 100644
--- a/modules/helpers.js
+++ b/modules/helpers.js
@@ -190,7 +190,7 @@ exp.get_render = function(uuid, scale, helm, body, callback) {
         return;
       }
       console.log("TYPE: " + get_type(helm, body))
-      var renderpath = __dirname + "/../" + config.renders_dir + hash + "-" + scale + "-" + "-" + get_type(helm, body) + ".png"; 
+      var renderpath = __dirname + "/../" + config.renders_dir + hash + "-" + scale + "-" + get_type(helm, body) + ".png"; 
       if (fs.existsSync(renderpath)) {
         renders.open_render(renderpath, function(err, img) {
           callback(err, 1, hash, img);