Return-Path: Delivered-To: apmail-hadoop-chukwa-commits-archive@minotaur.apache.org Received: (qmail 24784 invoked from network); 12 Jun 2009 22:06:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 Jun 2009 22:06:59 -0000 Received: (qmail 58690 invoked by uid 500); 12 Jun 2009 22:07:11 -0000 Delivered-To: apmail-hadoop-chukwa-commits-archive@hadoop.apache.org Received: (qmail 58678 invoked by uid 500); 12 Jun 2009 22:07:11 -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 58668 invoked by uid 99); 12 Jun 2009 22:07:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jun 2009 22:07:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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; Fri, 12 Jun 2009 22:07:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0554223888D6; Fri, 12 Jun 2009 22:06:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r784293 - in /hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection: collector/CollectorStub.java sender/RetryListOfCollectors.java Date: Fri, 12 Jun 2009 22:06:48 -0000 To: chukwa-commits@hadoop.apache.org From: asrabkin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090612220649.0554223888D6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: asrabkin Date: Fri Jun 12 22:06:48 2009 New Revision: 784293 URL: http://svn.apache.org/viewvc?rev=784293&view=rev Log: CHUKWA-291. Append slash to collector pathnames. This time for real. Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/sender/RetryListOfCollectors.java Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java?rev=784293&r1=784292&r2=784293&view=diff ============================================================================== --- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java (original) +++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java Fri Jun 12 22:06:48 2009 @@ -98,9 +98,10 @@ pool.setMaxThreads(THREADS); jettyServer.setThreadPool(pool); - // Add the cCllector servlet to server + // Add the collector servlet to server Context root = new Context(jettyServer, "/", Context.SESSIONS); - root.addServlet(new ServletHolder(new ServletCollector(conf)), "/chukwa"); + root.addServlet(new ServletHolder(new ServletCollector(conf)), "/*"); + root.setAllowNullPathInfo(false); // Add in any user-specified servlets for(Map.Entry e: servletsToAdd.entrySet()) { Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/sender/RetryListOfCollectors.java URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/sender/RetryListOfCollectors.java?rev=784293&r1=784292&r2=784293&view=diff ============================================================================== --- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/sender/RetryListOfCollectors.java (original) +++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/sender/RetryListOfCollectors.java Fri Jun 12 22:06:48 2009 @@ -53,23 +53,27 @@ try { BufferedReader br = new BufferedReader(new FileReader(collectorFile)); - String line; + String line, parsedline; while ((line = br.readLine()) != null) { if (!line.contains("://")) { // no protocol, assume http if (line.matches(".*:\\d+")) { - collectors.add("http://" + line); + parsedline = "http://" + line+"/"; } else { - collectors.add("http://" + line + ":" + portNo); + parsedline = "http://" + line + ":" + portNo; } } else { if (line.matches(".*:\\d+")) { - collectors.add(line); + parsedline = line; } else { - collectors.add(line + ":" + portNo); + parsedline = line + ":" + portNo; } } + if(!parsedline.matches(".*\\w/.*")) //no resource name + parsedline = parsedline+"/"; + collectors.add(parsedline); } + br.close(); } catch (FileNotFoundException e) { System.err