Author: kve
Date: Tue Mar 20 10:33:55 2012
New Revision: 1302828
URL: http://svn.apache.org/viewvc?rev=1302828&view=rev
Log:
WHIRR-556: Improve 'Running on $PROVIDER using identity $IDENTITY' message
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/bin/whirr
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/CleanupClusterCommand.java
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/DestroyClusterCommand.java
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/DestroyInstanceCommand.java
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/LaunchClusterCommand.java
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/ListClusterCommand.java
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/RoleLifecycleCommand.java
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/RunScriptCommand.java
whirr/trunk/core/src/main/java/org/apache/whirr/command/AbstractClusterCommand.java
Modified: whirr/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1302828&r1=1302827&r2=1302828&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Tue Mar 20 10:33:55 2012
@@ -13,6 +13,8 @@ Trunk (unreleased changes)
IMPROVEMENTS
+ WHIRR-556. Improve the 'Running on $PROVIDER using $IDENTITY' message (kve)
+
WHIRR-514. Avoid hardcoded Whirr version number in karaf tests (kve)
(orig: Update release instructions or fix update-version script?)
Modified: whirr/trunk/bin/whirr
URL:
http://svn.apache.org/viewvc/whirr/trunk/bin/whirr?rev=1302828&r1=1302827&r2=1302828&view=diff
==============================================================================
--- whirr/trunk/bin/whirr (original)
+++ whirr/trunk/bin/whirr Tue Mar 20 10:33:55 2012
@@ -66,8 +66,6 @@ if $cygwin; then
CLASSPATH=`cygpath -wp $CLASSPATH`;
fi
-echo Running on "$WHIRR_PROVIDER" using identity "$WHIRR_IDENTITY"
-
# Start the application
java $LOGGING_OPTS $WHIRR_CLI_OPTS -cp "$CLASSPATH" org.apache.whirr.cli.Main
"$@"
Modified:
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/CleanupClusterCommand.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/CleanupClusterCommand.java?rev=1302828&r1=1302827&r2=1302828&view=diff
==============================================================================
---
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/CleanupClusterCommand.java
(original)
+++
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/CleanupClusterCommand.java
Tue Mar 20 10:33:55 2012
@@ -62,6 +62,7 @@ public class CleanupClusterCommand exten
try {
ClusterSpec clusterSpec = getClusterSpec(optionSet);
+ printProviderInfo(out, err, clusterSpec, optionSet);
ClusterController controller =
createClusterController(clusterSpec.getServiceName());
controller.cleanupCluster(clusterSpec);
return 0;
Modified:
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/DestroyClusterCommand.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/DestroyClusterCommand.java?rev=1302828&r1=1302827&r2=1302828&view=diff
==============================================================================
---
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/DestroyClusterCommand.java
(original)
+++
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/DestroyClusterCommand.java
Tue Mar 20 10:33:55 2012
@@ -54,6 +54,7 @@ public class DestroyClusterCommand exten
}
try {
ClusterSpec clusterSpec = getClusterSpec(optionSet);
+ printProviderInfo(out, err, clusterSpec, optionSet);
return run(in, out, err, clusterSpec);
} catch (IllegalArgumentException e) {
Modified:
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/DestroyInstanceCommand.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/DestroyInstanceCommand.java?rev=1302828&r1=1302827&r2=1302828&view=diff
==============================================================================
---
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/DestroyInstanceCommand.java
(original)
+++
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/DestroyInstanceCommand.java
Tue Mar 20 10:33:55 2012
@@ -64,6 +64,7 @@ public class DestroyInstanceCommand exte
}
ClusterSpec clusterSpec = getClusterSpec(optionSet);
String instanceId = optionSet.valueOf(instanceOption);
+ printProviderInfo(out, err, clusterSpec, optionSet);
return run(in, out, err, clusterSpec, instanceId);
} catch (IllegalArgumentException e) {
Modified:
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/LaunchClusterCommand.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/LaunchClusterCommand.java?rev=1302828&r1=1302827&r2=1302828&view=diff
==============================================================================
---
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/LaunchClusterCommand.java
(original)
+++
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/LaunchClusterCommand.java
Tue Mar 20 10:33:55 2012
@@ -18,6 +18,10 @@
package org.apache.whirr.cli.command;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.util.List;
import joptsimple.OptionSet;
import org.apache.whirr.Cluster;
import org.apache.whirr.ClusterController;
@@ -26,11 +30,6 @@ import org.apache.whirr.ClusterSpec;
import org.apache.whirr.command.AbstractClusterCommand;
import org.apache.whirr.util.Utils;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.util.List;
-
/**
* A command to launch a new cluster.
*/
@@ -47,7 +46,6 @@ public class LaunchClusterCommand extend
@Override
public int run(InputStream in, PrintStream out, PrintStream err,
List<String> args) throws Exception {
-
OptionSet optionSet = parser.parse(args.toArray(new String[args.size()]));
if (!optionSet.nonOptionArguments().isEmpty()) {
@@ -57,6 +55,7 @@ public class LaunchClusterCommand extend
try {
ClusterSpec clusterSpec = getClusterSpec(optionSet);
+ printProviderInfo(out, err, clusterSpec, optionSet);
return run(in, out, err, clusterSpec);
} catch (IllegalArgumentException e) {
Modified:
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/ListClusterCommand.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/ListClusterCommand.java?rev=1302828&r1=1302827&r2=1302828&view=diff
==============================================================================
---
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/ListClusterCommand.java
(original)
+++
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/ListClusterCommand.java
Tue Mar 20 10:33:55 2012
@@ -63,6 +63,7 @@ public class ListClusterCommand extends
}
try {
ClusterSpec clusterSpec = getClusterSpec(optionSet);
+ printProviderInfo(out, err, clusterSpec, optionSet);
return run(in, out, err, clusterSpec);
} catch (IllegalArgumentException e) {
Modified:
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/RoleLifecycleCommand.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/RoleLifecycleCommand.java?rev=1302828&r1=1302827&r2=1302828&view=diff
==============================================================================
---
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/RoleLifecycleCommand.java
(original)
+++
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/RoleLifecycleCommand.java
Tue Mar 20 10:33:55 2012
@@ -69,6 +69,7 @@ public abstract class RoleLifecycleComma
try {
ClusterSpec clusterSpec = getClusterSpec(optionSet);
+ printProviderInfo(out, err, clusterSpec, optionSet);
return runLifecycleStep(
clusterSpec,
createClusterController(clusterSpec.getServiceName()),
Modified:
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/RunScriptCommand.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/RunScriptCommand.java?rev=1302828&r1=1302827&r2=1302828&view=diff
==============================================================================
---
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/RunScriptCommand.java
(original)
+++
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/RunScriptCommand.java
Tue Mar 20 10:33:55 2012
@@ -107,6 +107,7 @@ public class RunScriptCommand extends Ab
if (optionSet.has(rolesOption)) {
roles = optionSet.valueOf(rolesOption).split(",");
}
+ printProviderInfo(out, err, clusterSpec, optionSet);
return run(in, out, err, clusterSpec, ids, roles,
optionSet.valueOf(scriptOption));
} catch (IllegalArgumentException e) {
Modified:
whirr/trunk/core/src/main/java/org/apache/whirr/command/AbstractClusterCommand.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/command/AbstractClusterCommand.java?rev=1302828&r1=1302827&r2=1302828&view=diff
==============================================================================
---
whirr/trunk/core/src/main/java/org/apache/whirr/command/AbstractClusterCommand.java
(original)
+++
whirr/trunk/core/src/main/java/org/apache/whirr/command/AbstractClusterCommand.java
Tue Mar 20 10:33:55 2012
@@ -60,12 +60,7 @@ public abstract class AbstractClusterCom
protected OptionParser parser = new OptionParser();
private Map<Property, OptionSpec<?>> optionSpecs;
- private OptionSpec<String> configOption = parser
- .accepts("config", "Note that Whirr properties specified in " +
- "this file should all have a whirr. prefix.")
- .withRequiredArg()
- .describedAs("config.properties")
- .ofType(String.class);
+ private OptionSpec<String> configOption;
public AbstractClusterCommand(String name, String description,
ClusterControllerFactory factory) {
this(name, description, factory, new ClusterStateStoreFactory());
@@ -75,6 +70,14 @@ public abstract class AbstractClusterCom
ClusterStateStoreFactory stateStoreFactory) {
super(name, description);
+ configOption = parser.accepts("config", "Note that Whirr properties
specified in " +
+ "this file should all have a whirr. prefix.")
+ .withRequiredArg()
+ .describedAs("config.properties")
+ .ofType(String.class);
+
+ parser.accepts("quiet", "Be less verbose");
+
this.factory = factory;
this.stateStoreFactory = stateStoreFactory;
@@ -156,6 +159,13 @@ public abstract class AbstractClusterCom
return stateStoreFactory.create(spec);
}
+ protected void printProviderInfo(PrintStream out, PrintStream err,
+ ClusterSpec clusterSpec, OptionSet optionSet) {
+ if (!optionSet.has("quiet")) {
+ out.println(String.format("Running on provider %s using identity %s",
clusterSpec.getProvider(), clusterSpec.getIdentity()));
+ }
+ }
+
/**
* Print command execution error and a hint to help the user get more help
*/
