chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asrab...@apache.org
Subject svn commit: r887767 - in /hadoop/chukwa/trunk: CHANGES.txt bin/chukwa-config.sh
Date Sun, 06 Dec 2009 20:57:24 GMT
Author: asrabkin
Date: Sun Dec  6 20:57:24 2009
New Revision: 887767

URL: http://svn.apache.org/viewvc?rev=887767&view=rev
Log:
CHUKWA-241. Revise chukwa-config.sh so that chukwa runs after building from source. Contributed
by Eric Yang.

Modified:
    hadoop/chukwa/trunk/CHANGES.txt
    hadoop/chukwa/trunk/bin/chukwa-config.sh

Modified: hadoop/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/CHANGES.txt?rev=887767&r1=887766&r2=887767&view=diff
==============================================================================
--- hadoop/chukwa/trunk/CHANGES.txt (original)
+++ hadoop/chukwa/trunk/CHANGES.txt Sun Dec  6 20:57:24 2009
@@ -28,6 +28,8 @@
 
   BUG FIXES
 
+    CHUKWA-241. Revise chukwa-config.sh so that chukwa runs after building from source. (Eric
Yang via asrabkin)
+
     CHUKWA-2. Removed the default /var/log/messages streaming. (Eric Yang)
 
     CHUKWA-414. Better error messaging for pid file errors. (Bill Graham via asrabkin)

Modified: hadoop/chukwa/trunk/bin/chukwa-config.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/chukwa-config.sh?rev=887767&r1=887766&r2=887767&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/chukwa-config.sh (original)
+++ hadoop/chukwa/trunk/bin/chukwa-config.sh Sun Dec  6 20:57:24 2009
@@ -95,15 +95,21 @@
   . "${CHUKWA_CONF_DIR}/chukwa-env.sh"
 fi
 
-export DATACONFIG=${CHUKWA_CONF_DIR}/mdl.xml
-COMMON=`ls ${CHUKWA_HOME}/lib/*.jar`
+if [ -d "${CHUKWA_HOME}/build/ivy/lib/chukwa/common" ]; then
+  COMMON=`ls ${CHUKWA_HOME}/lib/*.jar ${CHUKWA_HOME}/build/ivy/lib/chukwa/common/*.jar`
+else
+  COMMON=`ls ${CHUKWA_HOME}/lib/*.jar`
+fi
 export COMMON=`echo ${COMMON} | sed 'y/ /:/'`
+
 export CHUKWA_CORE=${CHUKWA_HOME}/chukwa-core-${CHUKWA_VERSION}.jar
 export CHUKWA_AGENT=${CHUKWA_HOME}/chukwa-agent-${CHUKWA_VERSION}.jar
 export HICC_JAR=${CHUKWA_HOME}/hicc.war
-
 export CURRENT_DATE=`date +%Y%m%d%H%M`
 
+# Deprecated configuration for loading data to database.
+export DATACONFIG=${CHUKWA_CONF_DIR}/mdl.xml
+
 if [ -z ${HADOOP_JAR} ]; then
   if [ -z ${HADOOP_HOME} ]; then
         export HADOOP_HOME=../../..



Mime
View raw message