Commit ab79baf5 authored by mercury233's avatar mercury233

handle redis error

parent e8ee60e3
...@@ -90,6 +90,9 @@ if settings.modules.enable_cloud_replay ...@@ -90,6 +90,9 @@ if settings.modules.enable_cloud_replay
redis = require 'redis' redis = require 'redis'
zlib = require 'zlib' zlib = require 'zlib'
redisdb = redis.createClient host: "127.0.0.1", port: settings.modules.redis_port redisdb = redis.createClient host: "127.0.0.1", port: settings.modules.redis_port
redisdb.on 'error', (err)->
log.warn err
return
if settings.modules.enable_windbot if settings.modules.enable_windbot
settings.modules.windbots = require('./windbot/bots.json').windbots settings.modules.windbots = require('./windbot/bots.json').windbots
...@@ -731,7 +734,7 @@ net.createServer (client) -> ...@@ -731,7 +734,7 @@ net.createServer (client) ->
looplimit++ looplimit++
#log.info(looplimit) #log.info(looplimit)
if looplimit > 800 or ROOM_bad_ip[client.remoteAddress] > 5 or ROOM_connected_ip[client.remoteAddress] > 10 if looplimit > 800 or ROOM_bad_ip[client.remoteAddress] > 5
log.info("error ctos", client.name, client.remoteAddress) log.info("error ctos", client.name, client.remoteAddress)
bad_ip_count = ROOM_bad_ip[client.remoteAddress] bad_ip_count = ROOM_bad_ip[client.remoteAddress]
if bad_ip_count if bad_ip_count
......
...@@ -135,6 +135,9 @@ ...@@ -135,6 +135,9 @@
host: "127.0.0.1", host: "127.0.0.1",
port: settings.modules.redis_port port: settings.modules.redis_port
}); });
redisdb.on('error', function(err) {
log.warn(err);
});
} }
if (settings.modules.enable_windbot) { if (settings.modules.enable_windbot) {
...@@ -937,7 +940,7 @@ ...@@ -937,7 +940,7 @@
} }
} }
looplimit++; looplimit++;
if (looplimit > 800 || ROOM_bad_ip[client.remoteAddress] > 5 || ROOM_connected_ip[client.remoteAddress] > 10) { if (looplimit > 800 || ROOM_bad_ip[client.remoteAddress] > 5) {
log.info("error ctos", client.name, client.remoteAddress); log.info("error ctos", client.name, client.remoteAddress);
bad_ip_count = ROOM_bad_ip[client.remoteAddress]; bad_ip_count = ROOM_bad_ip[client.remoteAddress];
if (bad_ip_count) { if (bad_ip_count) {
......
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