Merge branch 'master' into tcg_random

ygopro-server.coffee

@@ -383,13 +383,13 @@ catch
 if settings.modules.cloud_replay.enabled
   redis = require 'redis'
   zlib = require 'zlib'
-  redisdb = redis.createClient(settings.modules.cloud_replay.redis)
+  redisdb = global.redisdb = redis.createClient(settings.modules.cloud_replay.redis)
   redisdb.on 'error', (err)->
     log.warn err
     return
 
 if settings.modules.windbot.enabled
-  windbots = loadJSON(settings.modules.windbot.botlist).windbots
+  windbots = global.windbots = loadJSON(settings.modules.windbot.botlist).windbots
   real_windbot_server_ip = settings.modules.windbot.server_ip
   if !settings.modules.windbot.server_ip.includes("127.0.0.1")
     dns = require('dns')
@@ -397,6 +397,7 @@ if settings.modules.windbot.enabled
       if(!err)
         real_windbot_server_ip = addr
     )
+  global.real_windbot_server_ip = real_windbot_server_ip
 
 
 if settings.modules.heartbeat_detection.enabled
@@ -414,7 +415,7 @@ users_cache = {}
 
 if settings.modules.mycard.enabled
   pgClient = require('pg').Client
-  pg_client = new pgClient(settings.modules.mycard.auth_database)
+  pg_client = global.pg_client = new pgClient(settings.modules.mycard.auth_database)
   pg_client.on 'error', (err) ->
     log.warn "PostgreSQL ERROR: ", err
     return
@@ -450,7 +451,7 @@ if settings.modules.challonge.enabled
   challonge_module_name = 'challonge'
   if settings.modules.challonge.use_custom_module
     challonge_module_name = settings.modules.challonge.use_custom_module
-  challonge = require(challonge_module_name).createClient(settings.modules.challonge.options)
+  challonge = global.challonge = require(challonge_module_name).createClient(settings.modules.challonge.options)
   if settings.modules.challonge.cache_ttl
     challonge_cache = []
   challonge_queue_callbacks = [[], []]
@@ -498,7 +499,7 @@ if settings.modules.challonge.enabled
     catch err
       log.warn("Errored pushing scores to Challonge.", err)
     return
-  refresh_challonge_cache = () ->
+  refresh_challonge_cache = global.refresh_challonge_cache = () ->
     if settings.modules.challonge.cache_ttl
       challonge_cache[0] = null
       challonge_cache[1] = null
@@ -541,7 +542,7 @@ get_memory_usage = get_memory_usage = ()->
       cached = parseInt(line[6], 10)
       actualFree = free + buffers + cached
     percentUsed = parseFloat(((1 - (actualFree / total)) * 100).toFixed(2))
-    memory_usage = percentUsed
+    memory_usage = global.memory_usage = percentUsed
     return
   return
 get_memory_usage()

ygopro-server.js

@@ -475,14 +475,14 @@
   if (settings.modules.cloud_replay.enabled) {
     redis = require('redis');
     zlib = require('zlib');
-    redisdb = redis.createClient(settings.modules.cloud_replay.redis);
+    redisdb = global.redisdb = redis.createClient(settings.modules.cloud_replay.redis);
     redisdb.on('error', function(err) {
       log.warn(err);
     });
   }
 
   if (settings.modules.windbot.enabled) {
-    windbots = loadJSON(settings.modules.windbot.botlist).windbots;
+    windbots = global.windbots = loadJSON(settings.modules.windbot.botlist).windbots;
     real_windbot_server_ip = settings.modules.windbot.server_ip;
     if (!settings.modules.windbot.server_ip.includes("127.0.0.1")) {
       dns = require('dns');
@@ -492,6 +492,7 @@
         }
       });
     }
+    global.real_windbot_server_ip = real_windbot_server_ip;
   }
 
   if (settings.modules.heartbeat_detection.enabled) {
@@ -512,7 +513,7 @@
 
   if (settings.modules.mycard.enabled) {
     pgClient = require('pg').Client;
-    pg_client = new pgClient(settings.modules.mycard.auth_database);
+    pg_client = global.pg_client = new pgClient(settings.modules.mycard.auth_database);
     pg_client.on('error', function(err) {
       log.warn("PostgreSQL ERROR: ", err);
     });
@@ -555,7 +556,7 @@
     if (settings.modules.challonge.use_custom_module) {
       challonge_module_name = settings.modules.challonge.use_custom_module;
     }
-    challonge = require(challonge_module_name).createClient(settings.modules.challonge.options);
+    challonge = global.challonge = require(challonge_module_name).createClient(settings.modules.challonge.options);
     if (settings.modules.challonge.cache_ttl) {
       challonge_cache = [];
     }
@@ -618,7 +619,7 @@
         log.warn("Errored pushing scores to Challonge.", err);
       }
     };
-    refresh_challonge_cache = function() {
+    refresh_challonge_cache = global.refresh_challonge_cache = function() {
       if (settings.modules.challonge.cache_ttl) {
         challonge_cache[0] = null;
         challonge_cache[1] = null;
@@ -661,7 +662,7 @@
         actualFree = free + buffers + cached;
       }
       percentUsed = parseFloat(((1 - (actualFree / total)) * 100).toFixed(2));
-      memory_usage = percentUsed;
+      memory_usage = global.memory_usage = percentUsed;
     });
   };