modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms.sh
| 10 ++++++----
modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlanner.java
| 9 ++++++++-
modules/helpers/metrics-simulator/src/main/resources/conf/log4j.properties
| 2 +-
3 files changed, 15 insertions(+), 6 deletions(-)
New commits:
commit b330921378577e98cbff16de0fd28dc0981372b9
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Mar 6 15:15:53 2013 -0500
some more clean up on the simulator
* clusterDir property is longer required
* log file is now written to RHQ_METRICS_SIMULATOR_HOME/log/rhq-ms.log
* no more clunky pushd/popd in rhq-ms.sh script
diff --git a/modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms.sh
b/modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms.sh
index 4258c68..ccd3a2d 100644
--- a/modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms.sh
+++ b/modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms.sh
@@ -3,11 +3,13 @@
_DOLLARZERO=`readlink "$0" 2>/dev/null || echo "$0"`
RHQ_MS_BIN_DIR_PATH=`dirname "$_DOLLARZERO"`
+dir=`pwd`
+
if [ -z "$RHQ_MS_HOME" ]; then
- pushd $RHQ_MS_BIN_DIR_PATH/..
+ cd $RHQ_MS_BIN_DIR_PATH/..
fi
RHQ_MS_HOME=`pwd`
-popd
+cd $dir
prepare_java()
{
@@ -30,13 +32,13 @@ prepare_classpath()
prepare_java_opts()
{
if [ -z "$RHQ_MS_JAVA_OPTS" ]; then
- RHQ_MS_JAVA_OPTS="-Xms64M -Xmx64M -Djava.net.preferIPv4Stack=true"
+ RHQ_MS_JAVA_OPTS="-Xms64M -Xmx64M -Djava.net.preferIPv4Stack=true
-Drhq.metrics.simulator.basedir=$RHQ_MS_HOME"
fi
}
launch_simulator()
{
- cmd="$RHQ_MS_JAVA_EXE $JAVA_OPTS $RHQ_MS_ADDITIONAL_JAVA_OPTS -cp
$RHQ_MS_CLASSPATH org.rhq.metrics.simulator.SimulatorCLI $@"
+ cmd="$RHQ_MS_JAVA_EXE $RHQ_MS_JAVA_OPTS $RHQ_MS_ADDITIONAL_JAVA_OPTS -cp
$RHQ_MS_CLASSPATH org.rhq.metrics.simulator.SimulatorCLI $@"
eval $cmd
return $?
}
diff --git
a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlanner.java
b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlanner.java
index 30d9779..5e361be 100644
---
a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlanner.java
+++
b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlanner.java
@@ -105,7 +105,14 @@ public class SimulationPlanner {
if (clusterConfigNode != null) {
clusterConfig.setEmbedded(clusterConfigNode.get("embedded").asBoolean(true));
- String clusterDir = clusterConfigNode.get("clusterDir").asText();
+ JsonNode clusterDirNode = clusterConfigNode.get("clusterDir");
+ String clusterDir;
+ if (clusterDirNode == null) {
+ File basedir = new
File(System.getProperty("rhq.metrics.simulator.basedir"));
+ clusterDir = basedir.getAbsolutePath();
+ } else {
+ clusterDir = clusterDirNode.asText();
+ }
if (clusterDir.isEmpty()) {
clusterConfig.setClusterDir("target");
} else {
diff --git a/modules/helpers/metrics-simulator/src/main/resources/conf/log4j.properties
b/modules/helpers/metrics-simulator/src/main/resources/conf/log4j.properties
index 50c2e2a..ee270e8 100644
--- a/modules/helpers/metrics-simulator/src/main/resources/conf/log4j.properties
+++ b/modules/helpers/metrics-simulator/src/main/resources/conf/log4j.properties
@@ -27,7 +27,7 @@ log4j.rootCategory=INFO, FILE, CONSOLE
log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender
log4j.appender.FILE.DatePattern='.'yyyy-MM-dd
-log4j.appender.FILE.File=log/rhq-ms.log
+log4j.appender.FILE.File=${rhq.metrics.simulator.basedir}/log/rhq-ms.log
log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
log4j.appender.FILE.layout.ConversionPattern=%d{ISO8601} %-5p [%t] (%c{5}) - %m%n
#log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
Show replies by date