gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1:修改389;390;391;392与261;262;263;264业务的表达式一致

Browse Source 
2:优化redis连接异常时返回的异常信息
This commit is contained in:
RenKaiGe-Office
2018-07-17 14:49:35 +08:00
parent ab52daaaef
commit 5730850b9c
2 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java
View File

@@ -24,6 +24,7 @@ import com.nis.util.ServiceAndRDBIndexReal;
import redis.clients.jedis.Jedis; import redis.clients.jedis.Jedis;
import redis.clients.jedis.Transaction; import redis.clients.jedis.Transaction;
import redis.clients.jedis.exceptions.JedisConnectionException;
@Service() @Service()
public class ConfigJedisServiceimpl implements ConfigRedisService { public class ConfigJedisServiceimpl implements ConfigRedisService {
@@ -164,8 +165,13 @@ public class ConfigJedisServiceimpl implements ConfigRedisService {
} else { } else {
transaction.discard(); transaction.discard();
} }
} catch (JedisConnectionException e) {
//transaction.discard();
logger.error("后台错误:连接redis异常,保存非maat类配置失败,{}",e.getMessage());
throw new RuntimeException("后台错误:连接redis异常,保存非maat类配置失败", e);
} catch (Exception e) { } catch (Exception e) {
transaction.discard(); transaction.discard();
logger.error("后台错误:保存非maat类配置发生了异常,{}",e.getMessage());
throw new RuntimeException("后台错误:保存非maat类配置发生了异常", e); throw new RuntimeException("后台错误:保存非maat类配置发生了异常", e);
} finally { } finally {
// 释放连接到连接池 // 释放连接到连接池
@@ -500,9 +506,12 @@ public class ConfigJedisServiceimpl implements ConfigRedisService {
addStatisticsReal(configMap, transaction); addStatisticsReal(configMap, transaction);
transaction.exec(); transaction.exec();
return true; return true;
}else { } else {
transaction.exec(); transaction.exec();
} }
} catch (JedisConnectionException e) {
//transaction.discard();
throw new RuntimeException("后台错误:连接redis异常,保存maat类配置失败", e);
} catch (Exception e) { } catch (Exception e) {
transaction.discard(); transaction.discard();
throw new RuntimeException("后台错误:保存maat类配置发生了异常", e); throw new RuntimeException("后台错误:保存maat类配置发生了异常", e);
@@ -877,6 +886,9 @@ public class ConfigJedisServiceimpl implements ConfigRedisService {
} else { } else {
transaction.discard(); transaction.discard();
} }
} catch (JedisConnectionException e) {
//transaction.discard();
throw new RuntimeException("后台错误:连接redis异常,删除非maat类配置失败", e);
} catch (Exception e) { } catch (Exception e) {
transaction.discard(); transaction.discard();
throw new RuntimeException("后台错误:删除非maat类配置发生了异常", e); throw new RuntimeException("后台错误:删除非maat类配置发生了异常", e);
@@ -933,6 +945,9 @@ public class ConfigJedisServiceimpl implements ConfigRedisService {
transaction.discard(); transaction.discard();
} }
} catch (JedisConnectionException e) {
//transaction.discard();
throw new RuntimeException("后台错误:连接redis异常,删除maat类配置失败", e);
} catch (Exception e) { } catch (Exception e) {
transaction.discard(); transaction.discard();
throw new RuntimeException("后台错误:删除maat类配置发生了异常", e); throw new RuntimeException("后台错误:删除maat类配置发生了异常", e);

27
src/main/resources/maatXml/applicationConfig-maatRedis.xml
View File

@@ -7,10 +7,10 @@
音频样例监测 389=0:MM_SAMPLE_AUDIO #0x186 视频样例监测 390=0:MM_SAMPLE_VIDEO #0x187 图片样例监测 音频样例监测 389=0:MM_SAMPLE_AUDIO #0x186 视频样例监测 390=0:MM_SAMPLE_VIDEO #0x187 图片样例监测
391=0:MM_SAMPLE_PIC #0x188 VOIP样例监测 392=0:MM_SAMPLE_VOIP --> 391=0:MM_SAMPLE_PIC #0x188 VOIP样例监测 392=0:MM_SAMPLE_VOIP -->
<p:maatType service="261;262;263;264"> <p:maatType service="261;262;263;264;389;390;391;392">
<p:expressions> <p:expressions>
<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression> <p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
<p:valueExpression>[cfg_id];\t;[is_valid];\t;[dst_file];\t;[dst_file_md5];\t;[op_time];&amp;nbsp;[level];\t;[file_id];\n</p:valueExpression> <p:valueExpression>[cfg_id];\t;[is_valid];\t;[dst_file];\t;[dst_file_md5];\t;[op_time];\t;[service];\t;[action];&amp;nbsp;[level];\t;[file_id];\n</p:valueExpression>
<!-- <p:valueExpression>[cfg_id];\t;[is_valid];\t;[dst_file];\t;[dst_file_md5];\t;[time_stamp];&amp;nbsp;[level];\t;[file_id];\n</p:valueExpression> --> <!-- <p:valueExpression>[cfg_id];\t;[is_valid];\t;[dst_file];\t;[dst_file_md5];\t;[time_stamp];&amp;nbsp;[level];\t;[file_id];\n</p:valueExpression> -->
</p:expressions> </p:expressions>
<p:sequences> <p:sequences>
@@ -28,29 +28,6 @@
<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression> <p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
</p:expressions> </p:expressions>
</p:maatType> </p:maatType>
<p:maatType service="389;390;391;392">
<p:expressions>
<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
<p:valueExpression>[cfg_id];\t;[service];\t;[action];\t;[level];\t;[dst_file];\t;[dst_file_md5];\t;[is_valid];\t;[op_time];&amp;nbsp;[file_id];\n</p:valueExpression>
</p:expressions>
<p:sequences>
<p:operation>1</p:operation>
<p:sequenceKey>MAAT_VERSION</p:sequenceKey>
</p:sequences>
<p:expressions>
<p:keyExpression>MAAT_UPDATE_STATUS</p:keyExpression>
</p:expressions>
<p:expressions>
<p:keyExpression>MAAT_RULE_TIMER</p:keyExpression>
</p:expressions>
<p:expressions>
<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
</p:expressions>
</p:maatType>
<!-- #0x109 音频色情阻断 265=0:MM_PORN_AUDIO_LEVEL #0x10A 视频色情阻断 266=0:MM_PORN_VIDEO_LEVEL <!-- #0x109 音频色情阻断 265=0:MM_PORN_AUDIO_LEVEL #0x10A 视频色情阻断 266=0:MM_PORN_VIDEO_LEVEL
#0x189 音频色情监测 393=0:MM_PORN_AUDIO_LEVEL #0x18A 视频色情监测 394=0:MM_PORN_VIDEO_LEVEL --> #0x189 音频色情监测 393=0:MM_PORN_AUDIO_LEVEL #0x18A 视频色情监测 394=0:MM_PORN_VIDEO_LEVEL -->
<p:maatType service="265;266;393;394"> <p:maatType service="265;266;393;394">