Commit d72e7a82 authored by nanahira's avatar nanahira

more globals

parent b95820df
...@@ -279,7 +279,7 @@ catch ...@@ -279,7 +279,7 @@ catch
if settings.modules.cloud_replay.enabled if settings.modules.cloud_replay.enabled
redis = require 'redis' redis = require 'redis'
zlib = require 'zlib' 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)-> redisdb.on 'error', (err)->
log.warn err log.warn err
return return
...@@ -293,6 +293,7 @@ if settings.modules.windbot.enabled ...@@ -293,6 +293,7 @@ if settings.modules.windbot.enabled
if(!err) if(!err)
real_windbot_server_ip = addr real_windbot_server_ip = addr
) )
global.real_windbot_server_ip = real_windbot_server_ip
if settings.modules.heartbeat_detection.enabled if settings.modules.heartbeat_detection.enabled
...@@ -310,7 +311,7 @@ users_cache = {} ...@@ -310,7 +311,7 @@ users_cache = {}
if settings.modules.mycard.enabled if settings.modules.mycard.enabled
pgClient = require('pg').Client 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) -> pg_client.on 'error', (err) ->
log.warn "PostgreSQL ERROR: ", err log.warn "PostgreSQL ERROR: ", err
return return
...@@ -346,7 +347,7 @@ if settings.modules.challonge.enabled ...@@ -346,7 +347,7 @@ if settings.modules.challonge.enabled
challonge_module_name = 'challonge' challonge_module_name = 'challonge'
if settings.modules.challonge.use_custom_module if settings.modules.challonge.use_custom_module
challonge_module_name = 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 if settings.modules.challonge.cache_ttl
challonge_cache = [] challonge_cache = []
challonge_queue_callbacks = [[], []] challonge_queue_callbacks = [[], []]
...@@ -394,7 +395,7 @@ if settings.modules.challonge.enabled ...@@ -394,7 +395,7 @@ if settings.modules.challonge.enabled
catch err catch err
log.warn("Errored pushing scores to Challonge.", err) log.warn("Errored pushing scores to Challonge.", err)
return return
refresh_challonge_cache = () -> refresh_challonge_cache = global.refresh_challonge_cache = () ->
if settings.modules.challonge.cache_ttl if settings.modules.challonge.cache_ttl
challonge_cache[0] = null challonge_cache[0] = null
challonge_cache[1] = null challonge_cache[1] = null
...@@ -433,7 +434,7 @@ get_memory_usage = get_memory_usage = ()-> ...@@ -433,7 +434,7 @@ get_memory_usage = get_memory_usage = ()->
cached = parseInt(line[6], 10) cached = parseInt(line[6], 10)
actualFree = free + buffers + cached actualFree = free + buffers + cached
percentUsed = parseFloat(((1 - (actualFree / total)) * 100).toFixed(2)) percentUsed = parseFloat(((1 - (actualFree / total)) * 100).toFixed(2))
memory_usage = percentUsed memory_usage = global.memory_usage = percentUsed
return return
return return
get_memory_usage() get_memory_usage()
......
...@@ -327,7 +327,7 @@ ...@@ -327,7 +327,7 @@
if (settings.modules.cloud_replay.enabled) { if (settings.modules.cloud_replay.enabled) {
redis = require('redis'); redis = require('redis');
zlib = require('zlib'); 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) { redisdb.on('error', function(err) {
log.warn(err); log.warn(err);
}); });
...@@ -344,6 +344,7 @@ ...@@ -344,6 +344,7 @@
} }
}); });
} }
global.real_windbot_server_ip = real_windbot_server_ip;
} }
if (settings.modules.heartbeat_detection.enabled) { if (settings.modules.heartbeat_detection.enabled) {
...@@ -364,7 +365,7 @@ ...@@ -364,7 +365,7 @@
if (settings.modules.mycard.enabled) { if (settings.modules.mycard.enabled) {
pgClient = require('pg').Client; 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) { pg_client.on('error', function(err) {
log.warn("PostgreSQL ERROR: ", err); log.warn("PostgreSQL ERROR: ", err);
}); });
...@@ -407,7 +408,7 @@ ...@@ -407,7 +408,7 @@
if (settings.modules.challonge.use_custom_module) { if (settings.modules.challonge.use_custom_module) {
challonge_module_name = 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) { if (settings.modules.challonge.cache_ttl) {
challonge_cache = []; challonge_cache = [];
} }
...@@ -470,7 +471,7 @@ ...@@ -470,7 +471,7 @@
log.warn("Errored pushing scores to Challonge.", err); 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) { if (settings.modules.challonge.cache_ttl) {
challonge_cache[0] = null; challonge_cache[0] = null;
challonge_cache[1] = null; challonge_cache[1] = null;
...@@ -503,7 +504,7 @@ ...@@ -503,7 +504,7 @@
actualFree = free + buffers + cached; actualFree = free + buffers + cached;
} }
percentUsed = parseFloat(((1 - (actualFree / total)) * 100).toFixed(2)); percentUsed = parseFloat(((1 - (actualFree / total)) * 100).toFixed(2));
memory_usage = percentUsed; memory_usage = global.memory_usage = percentUsed;
}); });
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment