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

Name incorrect (#1153)

This commit is contained in:
彭勇升 pengys 2018-05-03 18:28:23 +08:00 committed by 吴晟 Wu Sheng
parent 9e4a4553b6
commit 0313f18f6c
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationMappingEsUIDAO.java
View File

@ -65,13 +65,13 @@ public class ApplicationMappingEsUIDAO extends EsDAO implements IApplicationMapp
List<ApplicationMapping> applicationMappings = new LinkedList<>();
for (Terms.Bucket applicationIdBucket : applicationIdTerms.getBuckets()) {
int applicationId = applicationIdBucket.getKeyAsNumber().intValue();
Terms addressIdTerms = applicationIdBucket.getAggregations().get(ApplicationMappingTable.MAPPING_APPLICATION_ID.getName());
for (Terms.Bucket addressIdBucket : addressIdTerms.getBuckets()) {
int addressId = addressIdBucket.getKeyAsNumber().intValue();
Terms mappingApplicationIdTerms = applicationIdBucket.getAggregations().get(ApplicationMappingTable.MAPPING_APPLICATION_ID.getName());
for (Terms.Bucket mappingApplicationIdBucket : mappingApplicationIdTerms.getBuckets()) {
int mappingApplicationId = mappingApplicationIdBucket.getKeyAsNumber().intValue();
ApplicationMapping applicationMapping = new ApplicationMapping();
applicationMapping.setApplicationId(applicationId);
applicationMapping.setMappingApplicationId(addressId);
applicationMapping.setMappingApplicationId(mappingApplicationId);
applicationMappings.add(applicationMapping);
}
}

4
apm-dist/bin/collectorService.sh
View File

@ -43,8 +43,8 @@ eval exec "\"$_RUNJAVA\" ${JAVA_OPTS} ${COLLECTOR_OPTIONS} -classpath $CLASSPATH
if [ $? -eq 0 ]; then
sleep 1
echo "Skywalking Collector started successfully!"
echo "SkyWalking Collector started successfully!"
else
echo "Skywalking Collector started failure!"
echo "SkyWalking Collector started failure!"
exit 1
fi

4
apm-dist/bin/webappService.sh
View File

@ -40,8 +40,8 @@ eval exec "\"$_RUNJAVA\" ${JAVA_OPTS} -jar ${JAR_PATH}/skywalking-webapp.jar \
if [ $? -eq 0 ]; then
sleep 1
echo "Skywalking Web Application started successfully!"
echo "SkyWalking Web Application started successfully!"
else
echo "Skywalking Web Application started failure!"
echo "SkyWalking Web Application started failure!"
exit 1
fi