kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修改类名和部分描述

This commit is contained in:
wusheng 2015-12-03 10:30:41 +08:00
parent 7014fcd652
commit 108c38bcbb
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/AlarmOperator.java → skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/AlarmMessageStorage.java
View File

@ -1,16 +1,15 @@
package com.ai.cloud.skywalking.reciever.storage.chain.alarm;
import com.ai.cloud.skywalking.reciever.storage.chain.alarm.redis.RedisInitializer;
import redis.clients.jedis.Jedis;
import java.util.Collection;
import static com.ai.cloud.skywalking.reciever.conf.Config.Alarm.ALARM_EXPIRE_SECONDS;
public class AlarmOperator {
public class AlarmMessageStorage {
private static boolean exist(final String key, final String field) {
return RedisInitializer.redis(new RedisInitializer.Executor<Boolean>() {
return RedisAccessController.redis(new RedisAccessController.Executor<Boolean>() {
@Override
public Boolean exec(Jedis jedis) {
return jedis.hexists(key, field);
@ -19,7 +18,7 @@ public class AlarmOperator {
}
private static boolean exist(final String key) {
return RedisInitializer.redis(new RedisInitializer.Executor<Boolean>() {
return RedisAccessController.redis(new RedisAccessController.Executor<Boolean>() {
@Override
public Boolean exec(Jedis jedis) {
return jedis.exists(key);
@ -28,7 +27,7 @@ public class AlarmOperator {
}
private static Long set(final String key, final String field, final String value) {
return RedisInitializer.redis(new RedisInitializer.Executor<Long>() {
return RedisAccessController.redis(new RedisAccessController.Executor<Long>() {
@Override
public Long exec(Jedis jedis) {
if (exist(key, field)) {
@ -42,7 +41,7 @@ public class AlarmOperator {
}
private static Collection<String> get(final String key) {
return RedisInitializer.redis(new RedisInitializer.Executor<Collection<String>>() {
return RedisAccessController.redis(new RedisAccessController.Executor<Collection<String>>() {
@Override
public Collection<String> exec(Jedis jedis) {
if (!exist(key)) {

8
skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/redis/RedisInitializer.java → skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/RedisAccessController.java
View File

@ -1,4 +1,4 @@
package com.ai.cloud.skywalking.reciever.storage.chain.alarm.redis;
package com.ai.cloud.skywalking.reciever.storage.chain.alarm;
import com.ai.cloud.skywalking.reciever.conf.Config;
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
@ -7,9 +7,9 @@ import org.apache.logging.log4j.Logger;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
public class RedisInitializer {
public class RedisAccessController {
private static Logger logger = LogManager.getLogger(RedisInitializer.class);
private static Logger logger = LogManager.getLogger(RedisAccessController.class);
private static JedisPool jedisPool;
private static Object lock = new Object();
@ -29,7 +29,7 @@ public class RedisInitializer {
new JedisPool(genericObjectPoolConfig, config[0], Integer.valueOf(config[1]));
// Test connect redis.
RedisInitializer.redis(new Executor<String>() {
RedisAccessController.redis(new Executor<String>() {
@Override
public String exec(Jedis jedis) {
return jedis.get("ok");

4
skywalking-server/src/test/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/AlarmOperatorTest.java
View File

@ -18,8 +18,8 @@ public class AlarmOperatorTest {
ConfigInitializer.initialize(properties, Config.class);
String key = UUID.randomUUID().toString();
AlarmOperator.saveAlarmMessage(key, UUID.randomUUID().toString());
assertEquals(1, AlarmOperator.getAlarmMessage(key).size());
AlarmMessageStorage.saveAlarmMessage(key, UUID.randomUUID().toString());
assertEquals(1, AlarmMessageStorage.getAlarmMessage(key).size());
}