etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-9071: Properly parse stats.output.uri in StatsCollector 

Both host and path could have been NULL which causes the StatsCollector
no to start properly.

By checking if the Strings are not Empty or Null we make sure the StatsCollector
always runs and does not prevent the Management Server from starting.

Signed-off-by: Wido den Hollander <wido@widodh.nl>

Conflicts:
	server/src/com/cloud/server/StatsCollector.java
This commit is contained in:
Wido den Hollander 2016-09-15 12:18:21 +02:00
parent 9eb8b2e90b
commit c1997a1705
No known key found for this signature in database
GPG Key ID: 019B582DDB3ECA42
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/com/cloud/server/StatsCollector.java
View File

@ -34,6 +34,7 @@ import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import org.apache.cloudstack.utils.usage.UsageUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -271,12 +272,18 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
s_logger.info(scheme + " is not a valid protocol for external statistics. No statistics will be send.");
}
externalStatsHost = uri.getHost();
if (!StringUtils.isEmpty(uri.getHost())) {
externalStatsHost = uri.getHost();
}
externalStatsPort = uri.getPort();
externalStatsPrefix = uri.getPath().substring(1);
if (!StringUtils.isEmpty(uri.getPath())) {
externalStatsPrefix = uri.getPath().substring(1);
}
/* Append a dot (.) to the prefix if it is set */
if (externalStatsPrefix != null && !externalStatsPrefix.equals("")) {
if (!StringUtils.isEmpty(externalStatsPrefix)) {
externalStatsPrefix += ".";
} else {
externalStatsPrefix = "";