merge

data/default_config.json

@@ -77,7 +77,10 @@
     },
     "cloud_replay": {
       "enabled": false,
-      "redis_port": 6379,
+      "redis": {
+        "host": "127.0.0.1",
+        "port": 6379
+      },
       "enable_halfway_watch": true
     },
     "windbot": {

ygopro-server.coffee

@@ -241,9 +241,19 @@ catch
   config = {}
 settings = global.settings = merge(default_config, config, { arrayMerge: (destination, source) -> source })
 
+#import old configs
+imported = false
 #reset http.quick_death_rule from true to 1
 if settings.modules.http.quick_death_rule == true
   settings.modules.http.quick_death_rule = 1
+  imported = true
+#import the old redis port
+if settings.modules.cloud_replay.redis_port
+  settings.modules.cloud_replay.redis.port = settings.modules.cloud_replay.redis_port
+  delete settings.modules.cloud_replay.redis_port
+  imported = true
+#finish
+if imported
   setting_save(settings)
 
 # 读取数据
@@ -314,7 +324,7 @@ catch
 if settings.modules.cloud_replay.enabled
   redis = require 'redis'
   zlib = require 'zlib'
-  redisdb = redis.createClient host: "127.0.0.1", port: settings.modules.cloud_replay.redis_port
+  redisdb = redis.createClient(settings.modules.cloud_replay.redis)
   redisdb.on 'error', (err)->
     log.warn err
     return

ygopro-server.js

 // Generated by CoffeeScript 1.12.7
 (function() {
-  var CLIENT_check_vip, CLIENT_get_authorize_key, CLIENT_get_kick_reconnect_target, CLIENT_heartbeat_register, CLIENT_heartbeat_unregister, CLIENT_import_data, CLIENT_is_able_to_kick_reconnect, CLIENT_is_able_to_reconnect, CLIENT_is_player, CLIENT_kick, CLIENT_kick_reconnect, CLIENT_pre_reconnect, CLIENT_reconnect, CLIENT_reconnect_register, CLIENT_reconnect_unregister, CLIENT_send_pre_reconnect_info, CLIENT_send_reconnect_info, CLIENT_send_vip_status, CLIENT_use_cdkey, Cloud_replay_ids, ROOM_all, ROOM_bad_ip, ROOM_ban_player, ROOM_clear_disconnect, ROOM_connected_ip, ROOM_find_by_name, ROOM_find_by_port, ROOM_find_by_title, ROOM_find_or_create_ai, ROOM_find_or_create_by_name, ROOM_find_or_create_random, ROOM_players_banned, ROOM_players_oppentlist, ROOM_unwelcome, ROOM_validate, Room, SERVER_clear_disconnect, VIP_generate_cdkeys, _, addCallback, badwords, ban_user, bunyan, challonge, chat_color, concat_name, config, cppversion, crypto, date, default_config, default_data, dialogues, disconnect_list, duel_log, e, exec, execFile, fs, geoip, get_memory_usage, http, http_server, https, https_server, import_datas, j, k, l, len, len1, lflists, list, loadJSON, load_dialogues, load_dialogues_custom, load_tips, load_words, log, long_resolve_cards, memory_usage, merge, moment, net, oldbadwords, oldconfig, olddialogues, oldduellog, oldtips, oldwords, options, os, path, pgClient, pg_client, pg_query, redis, redisdb, ref, ref1, ref2, release_disconnect, report_to_big_brother, request, requestListener, roomlist, setting_change, setting_save, settings, spawn, spawnSync, tips, url, users_cache, v, vip_info, wait_room_start, wait_room_start_arena, windbot_bin, windbot_parameters, windbot_process, windbots, words, ygopro, zlib;
+  var CLIENT_check_vip, CLIENT_get_authorize_key, CLIENT_get_kick_reconnect_target, CLIENT_heartbeat_register, CLIENT_heartbeat_unregister, CLIENT_import_data, CLIENT_is_able_to_kick_reconnect, CLIENT_is_able_to_reconnect, CLIENT_is_player, CLIENT_kick, CLIENT_kick_reconnect, CLIENT_pre_reconnect, CLIENT_reconnect, CLIENT_reconnect_register, CLIENT_reconnect_unregister, CLIENT_send_pre_reconnect_info, CLIENT_send_reconnect_info, CLIENT_send_vip_status, CLIENT_use_cdkey, Cloud_replay_ids, ROOM_all, ROOM_bad_ip, ROOM_ban_player, ROOM_clear_disconnect, ROOM_connected_ip, ROOM_find_by_name, ROOM_find_by_port, ROOM_find_by_title, ROOM_find_or_create_ai, ROOM_find_or_create_by_name, ROOM_find_or_create_random, ROOM_players_banned, ROOM_players_oppentlist, ROOM_unwelcome, ROOM_validate, Room, SERVER_clear_disconnect, VIP_generate_cdkeys, _, addCallback, badwords, ban_user, bunyan, challonge, chat_color, concat_name, config, cppversion, crypto, date, default_config, default_data, dialogues, disconnect_list, duel_log, e, exec, execFile, fs, geoip, get_memory_usage, http, http_server, https, https_server, import_datas, imported, j, k, l, len, len1, lflists, list, loadJSON, load_dialogues, load_dialogues_custom, load_tips, load_words, log, long_resolve_cards, memory_usage, merge, moment, net, oldbadwords, oldconfig, olddialogues, oldduellog, oldtips, oldwords, options, os, path, pgClient, pg_client, pg_query, redis, redisdb, ref, ref1, ref2, release_disconnect, report_to_big_brother, request, requestListener, roomlist, setting_change, setting_save, settings, spawn, spawnSync, tips, url, users_cache, v, vip_info, wait_room_start, wait_room_start_arena, windbot_bin, windbot_parameters, windbot_process, windbots, words, ygopro, zlib;
 
   net = require('net');
 
@@ -291,8 +291,20 @@
     }
   });
 
+  imported = false;
+
   if (settings.modules.http.quick_death_rule === true) {
     settings.modules.http.quick_death_rule = 1;
+    imported = true;
+  }
+
+  if (settings.modules.cloud_replay.redis_port) {
+    settings.modules.cloud_replay.redis.port = settings.modules.cloud_replay.redis_port;
+    delete settings.modules.cloud_replay.redis_port;
+    imported = true;
+  }
+
+  if (imported) {
     setting_save(settings);
   }
 
@@ -398,10 +410,7 @@
   if (settings.modules.cloud_replay.enabled) {
     redis = require('redis');
     zlib = require('zlib');
-    redisdb = redis.createClient({
-      host: "127.0.0.1",
-      port: settings.modules.cloud_replay.redis_port
-    });
+    redisdb = redis.createClient(settings.modules.cloud_replay.redis);
     redisdb.on('error', function(err) {
       log.warn(err);
     });