From 68498d130208cd4e44c7d80ec44e5756706e7448 Mon Sep 17 00:00:00 2001 From: damiankam Date: Sat, 24 Sep 2016 21:21:45 +0300 Subject: [PATCH] fix redis log --- src/fastnetmon.cpp | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/fastnetmon.cpp b/src/fastnetmon.cpp index 2606e53..fd46cf7 100644 --- a/src/fastnetmon.cpp +++ b/src/fastnetmon.cpp @@ -3207,7 +3207,6 @@ void call_ban_handlers(uint32_t client_ip, attack_details& current_attack, std:: logger << log4cpp::Priority::INFO << "Call to GoBGP for ban client is finished: " << client_ip_as_string; } #endif - #ifdef REDIS if (redis_enabled) { @@ -3221,7 +3220,22 @@ void call_ban_handlers(uint32_t client_ip, attack_details& current_attack, std:: boost::thread redis_store_thread(store_data_in_redis, redis_key_name, basic_attack_information_in_json); redis_store_thread.detach(); logger << log4cpp::Priority::INFO << "Finish data save in Redis in key: " << redis_key_name; + + // If we have flow dump put in redis too + if (!flow_attack_details.empty()) { + std::string redis_key_name = client_ip_as_string + "_flow_dump"; + + if (!redis_prefix.empty()) { + redis_key_name = redis_prefix + "_" + client_ip_as_string + "_flow_dump"; + } + + logger << log4cpp::Priority::INFO << "Start data save in redis in key: " << redis_key_name; + boost::thread redis_store_thread(store_data_in_redis, redis_key_name, flow_attack_details); + redis_store_thread.detach(); + logger << log4cpp::Priority::INFO << "Finish data save in redis in key: " << redis_key_name; + } } +#endif #ifdef MONGO if (mongodb_enabled) { @@ -3237,21 +3251,6 @@ void call_ban_handlers(uint32_t client_ip, attack_details& current_attack, std:: logger << log4cpp::Priority::INFO << "Finish data save in Mongo in key: " << mongo_key_name; } #endif - - // If we have flow dump put in redis too - if (redis_enabled && !flow_attack_details.empty()) { - std::string redis_key_name = client_ip_as_string + "_flow_dump"; - - if (!redis_prefix.empty()) { - redis_key_name = redis_prefix + "_" + client_ip_as_string + "_flow_dump"; - } - - logger << log4cpp::Priority::INFO << "Start data save in redis in key: " << redis_key_name; - boost::thread redis_store_thread(store_data_in_redis, redis_key_name, flow_attack_details); - redis_store_thread.detach(); - logger << log4cpp::Priority::INFO << "Finish data save in redis in key: " << redis_key_name; - } -#endif }