Return-Path: Delivered-To: apmail-hadoop-chukwa-commits-archive@minotaur.apache.org Received: (qmail 82294 invoked from network); 6 Dec 2009 20:57:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Dec 2009 20:57:47 -0000 Received: (qmail 9971 invoked by uid 500); 6 Dec 2009 20:57:47 -0000 Delivered-To: apmail-hadoop-chukwa-commits-archive@hadoop.apache.org Received: (qmail 9951 invoked by uid 500); 6 Dec 2009 20:57:47 -0000 Mailing-List: contact chukwa-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: chukwa-dev@hadoop.apache.org Delivered-To: mailing list chukwa-commits@hadoop.apache.org Received: (qmail 9941 invoked by uid 99); 6 Dec 2009 20:57:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Dec 2009 20:57:47 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Dec 2009 20:57:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2659523889D0; Sun, 6 Dec 2009 20:57:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r887767 - in /hadoop/chukwa/trunk: CHANGES.txt bin/chukwa-config.sh Date: Sun, 06 Dec 2009 20:57:24 -0000 To: chukwa-commits@hadoop.apache.org From: asrabkin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091206205725.2659523889D0@eris.apache.org> 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=../../..