Merge branch 'master' into tcg_random

data/default_config.json

@@ -101,6 +101,7 @@
         "host": "127.0.0.1",
         "port": 6379
       },
+      "never_expire": false,
       "enable_halfway_watch": true
     },
     "windbot": {

ygopro-server.coffee

@@ -1449,7 +1449,7 @@ class Room
                       "replay_buffer", replay_buffer,
                       "player_names", player_names,
                       "date_time", date_time)
-        if !log_rep_id
+        if !log_rep_id and !settings.modules.cloud_replay.never_expire
           redisdb.expire("replay:"+replay_id, 60*60*24)
         recorded_ip=[]
         _.each player_ips, (player_ip)->

ygopro-server.js

@@ -1863,7 +1863,7 @@
           replay_buffer = replay_buffer.toString('binary');
           date_time = moment().format('YYYY-MM-DD HH:mm:ss');
           redisdb.hmset("replay:" + replay_id, "replay_id", replay_id, "replay_buffer", replay_buffer, "player_names", player_names, "date_time", date_time);
-          if (!log_rep_id) {
+          if (!log_rep_id && !settings.modules.cloud_replay.never_expire) {
             redisdb.expire("replay:" + replay_id, 60 * 60 * 24);
           }
           recorded_ip = [];