svn commit: r886903 - in /hadoop/chukwa/trunk/src: docs/src/documentation/content/xdocs/agent.xml java/org/apache/hadoop/chukwa/datacollection/agent/AgentControlSocketListener.java

[as...@apache.org]

Author: asrabkin
Date: Thu Dec  3 20:22:24 2009
New Revision: 886903

URL: http://svn.apache.org/viewvc?rev=886903&view=rev
Log:
Document new syntax for adaptor names.

Modified:
    hadoop/chukwa/trunk/src/docs/src/documentation/content/xdocs/agent.xml
    hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/agent/AgentControlSocketListener.java

Modified: hadoop/chukwa/trunk/src/docs/src/documentation/content/xdocs/agent.xml
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/docs/src/documentation/content/xdocs/agent.xml?rev=886903&r1=886902&r2=886903&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/docs/src/documentation/content/xdocs/agent.xml (original)
+++ hadoop/chukwa/trunk/src/docs/src/documentation/content/xdocs/agent.xml Thu Dec  3 20:22:24 2009
@@ -81,7 +81,10 @@
 
 <p>The adaptor name, if specified, should go after the add command, and be 
 followed with an equals sign. It should be a string of printable characters, 
-without whitespace or '='.  
+without whitespace or '='.  Chukwa Adaptor names all start with "adaptor_".
+If you specify an adaptor name which does not start with that prefix, it will
+be added automatically.  This convention is intended to make the Chukwa logs
+easier to parse.
 </p>
 
 <p>Adaptor parameters aren't required by the add command, but adaptor 

Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/agent/AgentControlSocketListener.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/agent/AgentControlSocketListener.java?rev=886903&r1=886902&r2=886903&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/agent/AgentControlSocketListener.java (original)
+++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/agent/AgentControlSocketListener.java Thu Dec  3 20:22:24 2009
@@ -131,7 +131,7 @@
         if (words.length < 2) {
           out.println("need to specify an adaptor to shut down, by number");
         } else {
-          santizeAdaptorName(out, words);
+          sanitizeAdaptorName(out, words);
           long offset = agent.stopAdaptor(words[1], true);
           if (offset != -1)
             out.println("OK adaptor " + words[1] + " stopping gracefully at "
@@ -143,7 +143,7 @@
         if (words.length < 2) {
           out.println("need to specify an adaptor to shut down, by number");
         } else {
-          santizeAdaptorName(out, words);
+          sanitizeAdaptorName(out, words);
           agent.stopAdaptor(words[1], false);
           out.println("OK adaptor " + words[1] + " stopped");
         }
@@ -186,7 +186,7 @@
       out.flush();
     }
 
-    private void santizeAdaptorName(PrintStream out, String[] words) {
+    private void sanitizeAdaptorName(PrintStream out, String[] words) {
       if(!words[1].startsWith("adaptor_")) {
         words[1] = "adaptor_" + words[1];
         out.println("adaptor names should start with adaptor_; "