modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms-env.sh | 5 modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms.sh | 2 modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/SimulatorThreadFactory.java | 62 ++++++++++ 3 files changed, 68 insertions(+), 1 deletion(-)
New commits: commit 2056abe3baf2c7196821c000e735e6c38b73f65c Author: John Sanda jsanda@redhat.com Date: Tue Mar 5 10:11:26 2013 -0500
previously forgot to commit SimulatorThreadFactory
diff --git a/modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms-env.sh b/modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms-env.sh new file mode 100755 index 0000000..8bfcb0b --- /dev/null +++ b/modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms-env.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +#RHQ_MS_JAVA_OPTS="-Xms64M -Xmx64M -Djava.net.preferIPv4Stack=true" + +#RHQ_MS_ADDITIONAL_JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,address=7979,server=y,suspend=y" 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 32319ee..0171a5a 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 @@ -12,7 +12,7 @@ popd prepare_java() { if [ -z "$JAVA_HOME" ]; then - echo "$JAVA_HOME must be set" + echo "JAVA_HOME must be set" exit 1 fi RHQ_MS_JAVA_EXE=$JAVA_HOME/bin/java diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/SimulatorThreadFactory.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/SimulatorThreadFactory.java new file mode 100644 index 0000000..dd492e7 --- /dev/null +++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/SimulatorThreadFactory.java @@ -0,0 +1,62 @@ +/* + * + * * RHQ Management Platform + * * Copyright (C) 2005-2012 Red Hat, Inc. + * * All rights reserved. + * * + * * This program is free software; you can redistribute it and/or modify + * * it under the terms of the GNU General Public License, version 2, as + * * published by the Free Software Foundation, and/or the GNU Lesser + * * General Public License, version 2.1, also as published by the Free + * * Software Foundation. + * * + * * This program is distributed in the hope that it will be useful, + * * but WITHOUT ANY WARRANTY; without even the implied warranty of + * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * * GNU General Public License and the GNU Lesser General Public License + * * for more details. + * * + * * You should have received a copy of the GNU General Public License + * * and the GNU Lesser General Public License along with this program; + * * if not, write to the Free Software Foundation, Inc., + * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +package org.rhq.metrics.simulator; + +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * @author John Sanda + */ +public class SimulatorThreadFactory implements ThreadFactory, Thread.UncaughtExceptionHandler { + + private final Log log; + + private AtomicInteger threadNumber = new AtomicInteger(0); + + private String poolName = "SimulatorThreadPool"; + + public SimulatorThreadFactory() { + log = LogFactory.getLog(poolName); + } + + @Override + public Thread newThread(Runnable r) { + Thread t = new Thread(r, poolName + "-" + threadNumber.getAndIncrement()); + t.setDaemon(true); + t.setUncaughtExceptionHandler(this); + + return t; + } + + @Override + public void uncaughtException(Thread t, Throwable e) { + log.error("Uncaught exception on scheduled thread [" + t.getName() + "]", e); + } +}
rhq-commits@lists.fedorahosted.org