svn commit: r1034929 - in /incubator/chukwa/trunk: bin/chukwa conf/chukwa-env.sh.template

[ey...@apache.org]

Author: eyang
Date: Sun Nov 14 03:39:42 2010
New Revision: 1034929

URL: http://svn.apache.org/viewvc?rev=1034929&view=rev
Log:
CHUKWA-353. Make port for HICC Jetty Server configurable.  (Ahmed Fathalla via Eric Yang)

Modified:
    incubator/chukwa/trunk/bin/chukwa
    incubator/chukwa/trunk/conf/chukwa-env.sh.template

Modified: incubator/chukwa/trunk/bin/chukwa
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/bin/chukwa?rev=1034929&r1=1034928&r2=1034929&view=diff
==============================================================================
--- incubator/chukwa/trunk/bin/chukwa (original)
+++ incubator/chukwa/trunk/bin/chukwa Sun Nov 14 03:39:42 2010
@@ -75,6 +75,14 @@ if [ "$HADOOP_CONF_DIR" != "" ]; then
   CLASSPATH=${HADOOP_CONF_DIR}:${CLASSPATH}
 fi
 
+if [ "$CHUKWA_HICC_PORT" != "" ]; then
+  CHUKWA_HICC_PORT=$CHUKWA_HICC_PORT
+fi
+
+if [ "$CHUKWA_HICC_PORT" = "" ]; then
+  CHUKWA_HICC_PORT=4080
+fi
+
 BACKGROUND="true"
 
 # configure command parameters
@@ -105,7 +113,7 @@ elif [ "$COMMAND" = "hicc" ]; then
   CLASSPATH=${CLASSPATH}:${WEB_SERVICE_COMMON}:${HICC_JAR}
   PID="hicc"
   HOST=`hostname`
-  JAVA_OPT="${JAVA_OPT} -Djetty.host=${HOST} -Djava.net.preferIPv4Stack=true"
+  JAVA_OPT="${JAVA_OPT} -Djetty.host=${HOST} -Djetty.port=${CHUKWA_HICC_PORT} -Djava.net.preferIPv4Stack=true"
 elif [ "$COMMAND" = "hroll" ]; then
   APP='hroll'
   CLASS='org.apache.hadoop.chukwa.extraction.demux.HourlyChukwaRecordRolling'

Modified: incubator/chukwa/trunk/conf/chukwa-env.sh.template
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/conf/chukwa-env.sh.template?rev=1034929&r1=1034928&r2=1034929&view=diff
==============================================================================
--- incubator/chukwa/trunk/conf/chukwa-env.sh.template (original)
+++ incubator/chukwa/trunk/conf/chukwa-env.sh.template Sun Nov 14 03:39:42 2010
@@ -105,4 +105,7 @@ export JDBC_URL_PREFIX=@TODO_CHUKWA_JDBC
 export CHUKWA_HICC_MIN_MEM=
 export CHUKWA_HICC_MAX_MEM=
 
+# HICC Jetty Server port, defaults to 4080
+#export CHUKWA_HICC_PORT=
+
 #export CLASSPATH=${CLASSPATH}:${HBASE_JAR}:${HBASE_CONF_DIR}:${ZOO_KEEPER_JAR}