Procházet zdrojové kódy

Add temporary cleaning solution to renders

Jake před 10 roky
rodič
revize
5811f38c95
3 změnil soubory, kde provedl 15 přidání a 5 odebrání
  1. 1 1
      modules/cache.js
  2. 13 3
      modules/clean_images.js
  3. 1 1
      modules/helpers.js

+ 1 - 1
modules/cache.js

@@ -16,7 +16,7 @@ function connect_redis() {
   }
   }
   redis.on("ready", function() {
   redis.on("ready", function() {
     logging.log("Redis connection established.");
     logging.log("Redis connection established.");
-    if(process.env.HEROKU || true) {
+    if(process.env.HEROKU) {
       logging.log("Running on heroku, flushing redis");
       logging.log("Running on heroku, flushing redis");
       redis.flushall();
       redis.flushall();
     }
     }

+ 13 - 3
modules/clean_images.js

@@ -33,14 +33,24 @@ exp.run = function() {
       logging.error(err);
       logging.error(err);
     } else if (clean) {
     } else if (clean) {
       logging.warn("ImageCleaner: Disk limit reached! Cleaning images now");
       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 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++) {
       for (var i = 0; i < Math.min(files.length, config.cleaning_amount); i++) {
         var filename = files[i];
         var filename = files[i];
         if (filename[0] != ".") {
         if (filename[0] != ".") {
-          fs.unlink(skindir + filename, function(){});
+          fs.unlink(facesdir + filename, function(){});
           fs.unlink(helmdir + 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 {
     } else {

+ 1 - 1
modules/helpers.js

@@ -190,7 +190,7 @@ exp.get_render = function(uuid, scale, helm, body, callback) {
         return;
         return;
       }
       }
       console.log("TYPE: " + get_type(helm, body))
       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)) {
       if (fs.existsSync(renderpath)) {
         renders.open_render(renderpath, function(err, img) {
         renders.open_render(renderpath, function(err, img) {
           callback(err, 1, hash, img);
           callback(err, 1, hash, img);