From 5730850b9c070ea88e466ff55590cde775d4f47c Mon Sep 17 00:00:00 2001 From: RenKaiGe-Office Date: Tue, 17 Jul 2018 14:49:35 +0800 Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9389;390;391;392=E4=B8=8E261?= =?UTF-8?q?;262;263;264=E4=B8=9A=E5=8A=A1=E7=9A=84=E8=A1=A8=E8=BE=BE?= =?UTF-8?q?=E5=BC=8F=E4=B8=80=E8=87=B4=202:=E4=BC=98=E5=8C=96redis?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E5=BC=82=E5=B8=B8=E6=97=B6=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=9A=84=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../restful/ConfigJedisServiceimpl.java | 17 +++++++++++- .../maatXml/applicationConfig-maatRedis.xml | 27 ++----------------- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java b/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java index d03ae35..6cab217 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java +++ b/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java @@ -24,6 +24,7 @@ import com.nis.util.ServiceAndRDBIndexReal; import redis.clients.jedis.Jedis; import redis.clients.jedis.Transaction; +import redis.clients.jedis.exceptions.JedisConnectionException; @Service() public class ConfigJedisServiceimpl implements ConfigRedisService { @@ -164,8 +165,13 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { } else { transaction.discard(); } + } catch (JedisConnectionException e) { + //transaction.discard(); + logger.error("后台错误:连接redis异常,保存非maat类配置失败,{}",e.getMessage()); + throw new RuntimeException("后台错误:连接redis异常,保存非maat类配置失败", e); } catch (Exception e) { transaction.discard(); + logger.error("后台错误:保存非maat类配置发生了异常,{}",e.getMessage()); throw new RuntimeException("后台错误:保存非maat类配置发生了异常", e); } finally { // 释放连接到连接池 @@ -500,9 +506,12 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { addStatisticsReal(configMap, transaction); transaction.exec(); return true; - }else { + } else { transaction.exec(); } + } catch (JedisConnectionException e) { + //transaction.discard(); + throw new RuntimeException("后台错误:连接redis异常,保存maat类配置失败", e); } catch (Exception e) { transaction.discard(); throw new RuntimeException("后台错误:保存maat类配置发生了异常", e); @@ -877,6 +886,9 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { } else { transaction.discard(); } + } catch (JedisConnectionException e) { + //transaction.discard(); + throw new RuntimeException("后台错误:连接redis异常,删除非maat类配置失败", e); } catch (Exception e) { transaction.discard(); throw new RuntimeException("后台错误:删除非maat类配置发生了异常", e); @@ -933,6 +945,9 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { transaction.discard(); } + } catch (JedisConnectionException e) { + //transaction.discard(); + throw new RuntimeException("后台错误:连接redis异常,删除maat类配置失败", e); } catch (Exception e) { transaction.discard(); throw new RuntimeException("后台错误:删除maat类配置发生了异常", e); diff --git a/src/main/resources/maatXml/applicationConfig-maatRedis.xml b/src/main/resources/maatXml/applicationConfig-maatRedis.xml index f51d84f..d17ed49 100644 --- a/src/main/resources/maatXml/applicationConfig-maatRedis.xml +++ b/src/main/resources/maatXml/applicationConfig-maatRedis.xml @@ -7,10 +7,10 @@ 音频样例监测 389=0:MM_SAMPLE_AUDIO #0x186 视频样例监测 390=0:MM_SAMPLE_VIDEO #0x187 图片样例监测 391=0:MM_SAMPLE_PIC #0x188 VOIP样例监测 392=0:MM_SAMPLE_VOIP --> - + EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id] - [cfg_id];\t;[is_valid];\t;[dst_file];\t;[dst_file_md5];\t;[op_time]; [level];\t;[file_id];\n + [cfg_id];\t;[is_valid];\t;[dst_file];\t;[dst_file_md5];\t;[op_time];\t;[service];\t;[action]; [level];\t;[file_id];\n @@ -28,29 +28,6 @@ MAAT_VERSION_TIMER - - - - - - EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id] - [cfg_id];\t;[service];\t;[action];\t;[level];\t;[dst_file];\t;[dst_file_md5];\t;[is_valid];\t;[op_time]; [file_id];\n - - - 1 - MAAT_VERSION - - - MAAT_UPDATE_STATUS - - - - MAAT_RULE_TIMER - - - MAAT_VERSION_TIMER - -