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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
zhangxin10 2015-11-19 21:11:23 +08:00
parent c2fb772e62 54e50f6c32
commit f946dfbcab
4 changed files with 53 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/conf/Config.java
View File

@ -82,5 +82,7 @@ public class Config {
public static class StorageChain {
public static long RETRY_STORAGE_WAIT_TIME = 50L;
public static String STORAGE_TYPE = "hbase";
}
}

22
skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/StorageChainController.java
View File

@ -1,13 +1,17 @@
package com.ai.cloud.skywalking.reciever.storage;
import static com.ai.cloud.skywalking.reciever.conf.Config.StorageChain.STORAGE_TYPE;
import java.util.ArrayList;
import java.util.List;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import com.ai.cloud.skywalking.reciever.conf.Config;
import com.ai.cloud.skywalking.reciever.model.BuriedPointEntry;
import com.ai.cloud.skywalking.reciever.storage.chain.SaveToHBaseChain;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.ArrayList;
import java.util.List;
import com.ai.cloud.skywalking.reciever.storage.chain.SaveToMySQLChain;
public class StorageChainController {
private static Logger logger = LogManager
@ -16,7 +20,13 @@ public class StorageChainController {
private static List<IStorageChain> chainArray = new ArrayList<IStorageChain>();
static {
chainArray.add(new SaveToHBaseChain());
if(STORAGE_TYPE.equalsIgnoreCase("hbase")){
chainArray.add(new SaveToHBaseChain());
}else if(STORAGE_TYPE.equalsIgnoreCase("mysql")){
chainArray.add(new SaveToMySQLChain());
}else{
throw new RuntimeException("illegal storage type.");
}
}
public static void doStorage(String buriedPointDatas) {

17
skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/SaveToMySQLChain.java Normal file
View File

@ -0,0 +1,17 @@
package com.ai.cloud.skywalking.reciever.storage.chain;
import java.util.List;
import com.ai.cloud.skywalking.reciever.model.BuriedPointEntry;
import com.ai.cloud.skywalking.reciever.storage.Chain;
import com.ai.cloud.skywalking.reciever.storage.IStorageChain;
public class SaveToMySQLChain implements IStorageChain {
@Override
public void doChain(List<BuriedPointEntry> entry, Chain chain) {
// TODO Auto-generated method stub
}
}

18
skywalking-webui/pom.xml
View File

@ -13,6 +13,24 @@
</properties>
<build>
<finalName>skywalking-webui</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>