From 4dd00b97fa0fc56af943a975bf674e13f379acd7 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Sun, 5 Jun 2016 00:05:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Maven__com_alibaba_dubbox_2_8_4.xml | 13 -- .../reciever/storage/AlarmRedisConnector.java | 128 ------------------ test/skywalking-agent-test/pom.xml | 39 ------ .../skywalking/agent/test/AgentTest.java | 20 --- .../agent/test/utils/JedisUtils.java | 72 ---------- 5 files changed, 272 deletions(-) delete mode 100644 skywalking-analysis/.idea/libraries/Maven__com_alibaba_dubbox_2_8_4.xml delete mode 100644 skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/AlarmRedisConnector.java delete mode 100644 test/skywalking-agent-test/pom.xml delete mode 100644 test/skywalking-agent-test/src/main/java/com/ai/cloud/skywalking/agent/test/AgentTest.java delete mode 100644 test/skywalking-agent-test/src/main/java/com/ai/cloud/skywalking/agent/test/utils/JedisUtils.java diff --git a/skywalking-analysis/.idea/libraries/Maven__com_alibaba_dubbox_2_8_4.xml b/skywalking-analysis/.idea/libraries/Maven__com_alibaba_dubbox_2_8_4.xml deleted file mode 100644 index e88e48216..000000000 --- a/skywalking-analysis/.idea/libraries/Maven__com_alibaba_dubbox_2_8_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/AlarmRedisConnector.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/AlarmRedisConnector.java deleted file mode 100644 index c515a8fbc..000000000 --- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/AlarmRedisConnector.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.ai.cloud.skywalking.reciever.storage; - -import org.apache.commons.pool2.impl.GenericObjectPoolConfig; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPool; - -import com.ai.cloud.skywalking.reciever.conf.Config; -import com.ai.cloud.skywalking.reciever.selfexamination.ServerHealthCollector; -import com.ai.cloud.skywalking.reciever.selfexamination.ServerHeathReading; - -/** - * 告警的redis连接器，用于管理redis连接 - * - * @author wusheng - * - */ -public class AlarmRedisConnector { - private static JedisPool jedisPool; - - static { - new RedisInspector().connect().start(); - } - - public static Jedis getJedis() { - if (Config.Alarm.ALARM_OFF_FLAG) { - return null; - } else { - return jedisPool.getResource(); - } - } - - public static void reportJedisFailure() { - RedisInspector.needConnectInit = true; - } - - private static class RedisInspector extends Thread { - private static Logger logger = LogManager - .getLogger(RedisInspector.class); - - private static boolean needConnectInit = true; - - private String[] config; - - public RedisInspector() { - super("RedisInspectorThread"); - String redisServerConfig = Config.Redis.REDIS_SERVER; - if (redisServerConfig == null || redisServerConfig.length() <= 0) { - logger.error("Redis server is not setting. Switch off alarm module. "); - Config.Alarm.ALARM_OFF_FLAG = true; - } else { - config = redisServerConfig.split(":"); - if (config.length != 2) { - logger.error("Redis server address is illegal setting, need to be 'ip:port'. Switch off alarm module. "); - Config.Alarm.ALARM_OFF_FLAG = true; - } - } - } - - private RedisInspector connect() { - if (jedisPool != null && !jedisPool.isClosed()) { - jedisPool.close(); - } - - GenericObjectPoolConfig genericObjectPoolConfig = buildGenericObjectPoolConfig(); - jedisPool = new JedisPool(genericObjectPoolConfig, config[0], - Integer.valueOf(config[1])); - // Test connect redis. - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - jedis.get("ok"); - needConnectInit = false; - } catch (Exception e) { - logger.error("can't connect to redis[" - + Config.Redis.REDIS_SERVER + "]", e); - } finally { - if (jedis != null) { - jedis.close(); - } - } - return this; - } - - @Override - public void run() { - if (Config.Alarm.ALARM_OFF_FLAG) - return; - - while (true) { - try { - if (needConnectInit) { - connect(); - } - - if (needConnectInit) { - ServerHealthCollector.getCurrentHeathReading(null) - .updateData(ServerHeathReading.ERROR, - "alarm redis connect failue."); - } else { - ServerHealthCollector.getCurrentHeathReading(null) - .updateData(ServerHeathReading.INFO, - "alarm redis connectted."); - } - } catch (Throwable t) { - logger.error("redis init connect failue", t); - } - - try { - Thread.sleep(Config.Alarm.ALARM_REDIS_INSPECTOR_INTERVAL); - } catch (InterruptedException e) { - logger.error("Failure sleep.", e); - } - } - } - - private GenericObjectPoolConfig buildGenericObjectPoolConfig() { - GenericObjectPoolConfig genericObjectPoolConfig = new GenericObjectPoolConfig(); - genericObjectPoolConfig.setTestOnBorrow(true); - genericObjectPoolConfig.setMaxIdle(Config.Redis.REDIS_MAX_IDLE); - genericObjectPoolConfig.setMinIdle(Config.Redis.REDIS_MIN_IDLE); - genericObjectPoolConfig.setMaxTotal(Config.Redis.REDIS_MAX_TOTAL); - return genericObjectPoolConfig; - } - } -} diff --git a/test/skywalking-agent-test/pom.xml b/test/skywalking-agent-test/pom.xml deleted file mode 100644 index f57d47d15..000000000 --- a/test/skywalking-agent-test/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - 4.0.0 - - - com.ai.cloud - skywalking - 1.0-Final - - - skywalking-agent-test - jar - - skywalking-agent-test - http://maven.apache.org - - - UTF-8 - - - - - junit - junit - 4.12 - test - - - org.apache.logging.log4j - log4j-core - 2.4.1 - - - redis.clients - jedis - 2.8.1 - - - diff --git a/test/skywalking-agent-test/src/main/java/com/ai/cloud/skywalking/agent/test/AgentTest.java b/test/skywalking-agent-test/src/main/java/com/ai/cloud/skywalking/agent/test/AgentTest.java deleted file mode 100644 index eaeb25f27..000000000 --- a/test/skywalking-agent-test/src/main/java/com/ai/cloud/skywalking/agent/test/AgentTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.ai.cloud.skywalking.agent.test; - -import com.ai.cloud.skywalking.agent.test.utils.JedisUtils; - -/** - * Created by xin on 16-6-3. - */ -public class AgentTest { - - public static void main(String[] args) { - System.out.println("Begin..."); - JedisUtils.setData("testKey1", "testKey2"); - - System.out.println("testKey1 = " + JedisUtils.getData("testKey1")); - - JedisUtils.expire("testKey1"); - - System.out.println("End....."); - } -} diff --git a/test/skywalking-agent-test/src/main/java/com/ai/cloud/skywalking/agent/test/utils/JedisUtils.java b/test/skywalking-agent-test/src/main/java/com/ai/cloud/skywalking/agent/test/utils/JedisUtils.java deleted file mode 100644 index 40e8d4bfe..000000000 --- a/test/skywalking-agent-test/src/main/java/com/ai/cloud/skywalking/agent/test/utils/JedisUtils.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.ai.cloud.skywalking.agent.test.utils; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPool; - -import java.io.InputStream; -import java.util.Properties; - -public class JedisUtils { - private static JedisPool jedisPool; - private static Logger logger = LogManager.getLogger(JedisUtils.class); - - static { - InputStream redisConfigFileStream = JedisUtils.class.getResourceAsStream("/redis.conf"); - Properties jedisConfig = new Properties(); - try { - jedisConfig.load(redisConfigFileStream); - } catch (Exception e) { - System.err.print("Failed to load redis.conf"); - System.exit(-1); - } - - jedisPool = new JedisPool(jedisConfig.getProperty("redis.ip", "127.0.0.1"), - Integer.parseInt(jedisConfig.getProperty("redis.port", "6379"))); - } - - public static void setData(String key, String value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - jedis.set(key, value); - } catch (Exception e) { - logger.error("Failed to set data", e); - } finally { - if (jedis != null) { - jedis.close(); - } - } - } - - public static String getData(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.get(key); - } catch (Exception e) { - logger.error("Failed to set data", e); - } finally { - if (jedis != null) { - jedis.close(); - } - } - - return null; - } - - public static void expire(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - jedis.expire(key, 0); - } catch (Exception e) { - logger.error("Failed to set data", e); - } finally { - if (jedis != null) { - jedis.close(); - } - } - } -}