quick cleanup of probe code (not currently live)
git-svn-id: https://svn.apache.org/repos/asf/incubator/slider/trunk@1596193 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/slider-core/src/main/java/org/apache/slider/server/servicemonitor/MonitorUtils.java b/slider-core/src/main/java/org/apache/slider/server/servicemonitor/MonitorUtils.java
index 9e59974..3b2c6d7 100644
--- a/slider-core/src/main/java/org/apache/slider/server/servicemonitor/MonitorUtils.java
+++ b/slider-core/src/main/java/org/apache/slider/server/servicemonitor/MonitorUtils.java
@@ -50,7 +50,7 @@
* @return a list view with no empty strings
*/
public static List<String> prepareArgs(String[] args) {
- List<String> argsList = new ArrayList<String>(args.length);
+ List<String> argsList = new ArrayList<>(args.length);
StringBuilder argsStr = new StringBuilder("Arguments: [");
for (String arg : args) {
argsStr.append('"').append(arg).append("\" ");
@@ -64,49 +64,6 @@
}
/**
- * convert the system properties to a buffer for printing
- * @return a multi-line list of key-value pairs
- */
- public static String dumpSystemProperties() {
- TreeSet<String> keys = new TreeSet<String>();
- for (Map.Entry<Object, Object> entry : System.getProperties().entrySet()) {
- keys.add(entry.getKey().toString());
- }
- StringBuilder builder = new StringBuilder();
- for (String key : keys) {
- builder
- .append(" ")
- .append(key)
- .append('=')
- .append(System.getProperty(key))
- .append('\n');
- }
- return builder.toString();
- }
-
- /**
- * Dump the system environment
- * @return the environment
- */
- public static String dumpEnv() {
- Map<String, String> env = System.getenv();
- TreeSet<String> keys = new TreeSet<String>();
- for (Map.Entry<String, String> entry : env.entrySet()) {
- keys.add(entry.getKey());
- }
- StringBuilder builder = new StringBuilder();
- for (String key : keys) {
- builder
- .append(" ")
- .append(key)
- .append('=')
- .append(env.get(key))
- .append('\n');
- }
- return builder.toString();
- }
-
- /**
* Convert milliseconds to human time -the exact format is unspecified
* @param milliseconds a time in milliseconds
* @return a time that is converted to human intervals
diff --git a/slider-core/src/main/java/org/apache/slider/server/servicemonitor/ProbeFailedException.java b/slider-core/src/main/java/org/apache/slider/server/servicemonitor/ProbeFailedException.java
index 5389eac..f09b848 100644
--- a/slider-core/src/main/java/org/apache/slider/server/servicemonitor/ProbeFailedException.java
+++ b/slider-core/src/main/java/org/apache/slider/server/servicemonitor/ProbeFailedException.java
@@ -25,7 +25,7 @@
public final ProbeStatus status;
public ProbeFailedException(String text, ProbeStatus status) {
- super((text == null ? "" : (text + ": ")) + status, status.getThrown());
+ super((text == null ? "Probe Failed" : (text + ": ")) + status, status.getThrown());
this.status = status;
}
diff --git a/slider-core/src/main/java/org/apache/slider/server/servicemonitor/ProbeInterruptedException.java b/slider-core/src/main/java/org/apache/slider/server/servicemonitor/ProbeInterruptedException.java
index dee0e09..5a02f46 100644
--- a/slider-core/src/main/java/org/apache/slider/server/servicemonitor/ProbeInterruptedException.java
+++ b/slider-core/src/main/java/org/apache/slider/server/servicemonitor/ProbeInterruptedException.java
@@ -22,4 +22,8 @@
*
*/
public class ProbeInterruptedException extends Exception {
+
+ public ProbeInterruptedException() {
+ super("Probe Interrupted");
+ }
}
