modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeDiscoveryComponent.java
| 15 +++++-----
1 file changed, 8 insertions(+), 7 deletions(-)
New commits:
commit ab0832b1e58e77a5a5b8eff73e35c0ff9232d70c
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon May 6 12:38:22 2013 -0500
[BZ 960044] Improve Cassandra discovery resilience to process discovery errors.
diff --git
a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeDiscoveryComponent.java
b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeDiscoveryComponent.java
index 0ef6a0d..1ab0b6b 100644
---
a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeDiscoveryComponent.java
+++
b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeDiscoveryComponent.java
@@ -70,17 +70,14 @@ public class CassandraNodeDiscoveryComponent extends
JMXDiscoveryComponent {
private DiscoveredResourceDetails getDetails(ResourceDiscoveryContext<?>
context,
ProcessScanResult processScanResult) {
- ProcessInfo processInfo = processScanResult.getProcessInfo();
-
Configuration pluginConfig = context.getDefaultPluginConfiguration();
String jmxPort = null;
-
-
- String[] arguments = processInfo.getCommandLine();
StringBuilder commandLineBuilder = new StringBuilder(400);
int classpathIndex = -1;
+ ProcessInfo processInfo = processScanResult.getProcessInfo();
+ String[] arguments = processInfo.getCommandLine();
for (int i = 0; i < arguments.length; i++) {
String arg = arguments[i];
@@ -106,8 +103,12 @@ public class CassandraNodeDiscoveryComponent extends
JMXDiscoveryComponent {
if (classpathEntry.endsWith("conf")) {
yamlConfigurationPath = new File(classpathEntry);
if (!yamlConfigurationPath.isAbsolute()) {
- //relative path, use process CWD to find absolute path of the
conf directory
- yamlConfigurationPath = new
File(processInfo.getExecutable().getCwd(), classpathEntry);
+ try {
+ //relative path, use process CWD to find absolute path of the
conf directory
+ yamlConfigurationPath = new
File(processInfo.getExecutable().getCwd(), classpathEntry);
+ } catch (Exception e) {
+ log.error("Error creating path for yaml file.",
e);
+ }
}
}
}
Show replies by date