Changeset 3399

Show
Ignore:
Timestamp:
03/02/10 14:03:04 (5 months ago)
Author:
knan
Message:

jmx_ : respect JRE_HOME, if configured

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/plugins/node.d/jmx_.in

    r3229 r3399  
    2323    env.username monitorRole 
    2424    env.password SomethingSecret 
     25 
     26    env.JRE_HOME /usr/lib/jvm/java-6-sun/jre 
    2527 
    2628Needed configuration on the Tomcat side: add 
    …… 
    8082MUNIN_JAR="@@JAVALIBDIR@@/munin-jmx-plugins.jar" 
    8183 
     84if [ "x$JRE_HOME" != "x" ] ; then 
     85  JRE=$JRE_HOME/bin/java 
     86  export JRE_HOME=$JRE_HOME 
     87fi 
     88JAVA_BIN=${JRE:-@@JAVARUN@@} 
     89 
    8290ip=${ip:-127.0.0.1} 
    8391port=${port:-5400} 
    …… 
    130138    CONNECT=$? 
    131139 
    132     JAVA_BIN="@@JAVARUN@@" 
    133140    $JAVA_BIN -? >/dev/null 2>&1 
    134141    JAVA=$? 
    …… 
    166173fi 
    167174 
    168 ip=$ip port=$port @@JAVARUN@@ -cp $MUNIN_JAR org.munin.plugin.jmx.$jmxfunc $param 
     175ip=$ip port=$port $JAVA_BIN -cp $MUNIN_JAR org.munin.plugin.jmx.$jmxfunc $param