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:
ascrutae 2016-04-07 19:21:24 +08:00
parent 8ac17a8c3d f574a1fb44
commit 8baae7c606
2 changed files with 3 additions and 3 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/persistance/RegisterPersistenceThread.java
View File

@ -57,8 +57,6 @@ public class RegisterPersistenceThread extends Thread {
Collection<FileRegisterEntry> fileRegisterEntries = MemoryRegister
.instance().getEntries();
logger.debug("file Register Entries size [{}]",
fileRegisterEntries.size());
try {
writer = new BufferedWriter(new FileWriter(file));
} catch (IOException e) {

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

@ -47,6 +47,8 @@ public class StorageChainController {
} catch (Throwable e) {
logger.error("ready to save buriedPoint error, choose to ignore. data="
+ buriedPoint, e);
ServerHealthCollector.getCurrentHeathReading("StorageChainController").updateData(ServerHeathReading.ERROR,
"ready to save buriedPoint error, choose to ignore. data=" + buriedPoint);
}
}
@ -55,7 +57,7 @@ public class StorageChainController {
chain.doChain(spans);
} catch (Throwable e) {
logger.error("Failed to storage chain.", e);
ServerHealthCollector.getCurrentHeathReading("storage-chain").updateData(ServerHeathReading.ERROR,
ServerHealthCollector.getCurrentHeathReading("StorageChainController").updateData(ServerHeathReading.ERROR,
"Failed to storage chain.Cause:" + e.getMessage());
}
}