You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2010/11/24 17:47:00 UTC

svn commit: r1038684 - in /trafficserver/site/trunk/docs/v2/admin: cli.htm errors.htm files.htm log.htm trouble.htm

Author: igalic
Date: Wed Nov 24 16:46:59 2010
New Revision: 1038684

URL: http://svn.apache.org/viewvc?rev=1038684&view=rev
Log:
perl -p -i -e 's/\blog2\b/log/g' *.htm *.html  for TS-556

Modified:
    trafficserver/site/trunk/docs/v2/admin/cli.htm
    trafficserver/site/trunk/docs/v2/admin/errors.htm
    trafficserver/site/trunk/docs/v2/admin/files.htm
    trafficserver/site/trunk/docs/v2/admin/log.htm
    trafficserver/site/trunk/docs/v2/admin/trouble.htm

Modified: trafficserver/site/trunk/docs/v2/admin/cli.htm
URL: http://svn.apache.org/viewvc/trafficserver/site/trunk/docs/v2/admin/cli.htm?rev=1038684&r1=1038683&r2=1038684&view=diff
==============================================================================
--- trafficserver/site/trunk/docs/v2/admin/cli.htm (original)
+++ trafficserver/site/trunk/docs/v2/admin/cli.htm Wed Nov 24 16:46:59 2010
@@ -375,23 +375,23 @@
        </tr>
        <tr>
          <td><p> Log files currently open</p></td>
-         <td><p> <i><code> proxy.process.log2.log_files_open</code> </i></p></td>
+         <td><p> <i><code> proxy.process.log.log_files_open</code> </i></p></td>
        </tr>
        <tr>
          <td><p> Space used for log files</p></td>
-         <td><p> <i><code> proxy.process.log2.log_files_space_used</code> </i></p></td>
+         <td><p> <i><code> proxy.process.log.log_files_space_used</code> </i></p></td>
        </tr>
        <tr>
          <td><p> Number of access events logged</p></td>
-         <td><p> <i><code> proxy.process.log2.event_log_access</code> </i></p></td>
+         <td><p> <i><code> proxy.process.log.event_log_access</code> </i></p></td>
        </tr>
        <tr>
          <td><p> Number of access events skipped</p></td>
-         <td><p> <i><code> proxy.process.log2.event_log_access_skip</code> </i></p></td>
+         <td><p> <i><code> proxy.process.log.event_log_access_skip</code> </i></p></td>
        </tr>
        <tr>
          <td><p> Number of error events logged</p></td>
-         <td><p> <i><code> proxy.process.log2.event_log_error</code> </i></p></td>
+         <td><p> <i><code> proxy.process.log.event_log_error</code> </i></p></td>
        </tr>
        <tr>
          <td rowspan="1" colspan="2"><p><strong> Congestion Control</strong></p></td>

Modified: trafficserver/site/trunk/docs/v2/admin/errors.htm
URL: http://svn.apache.org/viewvc/trafficserver/site/trunk/docs/v2/admin/errors.htm?rev=1038684&r1=1038683&r2=1038684&view=diff
==============================================================================
--- trafficserver/site/trunk/docs/v2/admin/errors.htm (original)
+++ trafficserver/site/trunk/docs/v2/admin/errors.htm Wed Nov 24 16:46:59 2010
@@ -132,7 +132,7 @@
        </tr>
        <tr>
          <td><p><code> Traffic Server can't open<em> filename </em>for reading custom formats</code></p></td>
-         <td><p> Make sure  the <code> <i>proxy.config.log2.config_file</i></code> variable in the <code> records.config</code> file contains the correct path to the custom log configuration file (the default is<code> logging/logs.config</code> ). </p></td>
+         <td><p> Make sure  the <code> <i>proxy.config.log.config_file</i></code> variable in the <code> records.config</code> file contains the correct path to the custom log configuration file (the default is<code> logging/logs.config</code> ). </p></td>
        </tr>
        <tr>
          <td><p><code> Traffic Server could not open logfile <em> filename</em> </code></p></td>

Modified: trafficserver/site/trunk/docs/v2/admin/files.htm
URL: http://svn.apache.org/viewvc/trafficserver/site/trunk/docs/v2/admin/files.htm?rev=1038684&r1=1038683&r2=1038684&view=diff
==============================================================================
--- trafficserver/site/trunk/docs/v2/admin/files.htm (original)
+++ trafficserver/site/trunk/docs/v2/admin/files.htm Wed Nov 24 16:46:59 2010
@@ -740,7 +740,7 @@ where <code><i>partition_numbers</i></co
         </tr>
         <tr>
           <td><p><code>&lt;RollingEnabled = &quot;truth value&quot;/&gt;</code></p></td>
-          <td><p>Enables or disables log file rolling for the <code>LogObject</code>. This setting overrides the value for the <code> <i>proxy.config.log2.rolling_enabled</i></code> variable in the <code> records.config</code> file. Set <code> <i>truth value</i></code> to one of the following values:</p>
+          <td><p>Enables or disables log file rolling for the <code>LogObject</code>. This setting overrides the value for the <code> <i>proxy.config.log.rolling_enabled</i></code> variable in the <code> records.config</code> file. Set <code> <i>truth value</i></code> to one of the following values:</p>
               <p><code> 0</code> to disable rolling for this particular <code>LogObject</code>.<br />
             <code> 1</code> to roll log files at specific intervals during the day (you specify time intervals with the <code> RollingIntervalSec</code> and <code> RollingOffsetHr </code> fields).<br />
             <code>2</code> to roll log files when they reach a certain size (you specify the size with the<code> RollingSizeMb </code> field).<br />
@@ -750,12 +750,12 @@ where <code><i>partition_numbers</i></co
         <tr>
           <td><p><code>&lt;RollingIntervalSec = &quot;seconds&quot;/&gt;</code></p></td>
           <td><p>The seconds between log file rolling for the <code>LogObject</code>; enables  you to specify different rolling intervals for different <code>LogObjects</code>. <br />
-          This setting overrides the value for <code> <i>proxy.config.log2.rolling_interval_sec </i></code> in the <code> records.config</code> file.  </p></td>
+          This setting overrides the value for <code> <i>proxy.config.log.rolling_interval_sec </i></code> in the <code> records.config</code> file.  </p></td>
         </tr>
         <tr>
           <td><p><code>&lt;RollingOffsetHr = &quot;hour&quot;/&gt;</code></p></td>
           <td><p>Specifies an hour (from 0 to 23) at which rolling is guaranteed to align. Rolling might start before then, but a rolled file will be produced only at that time. The impact of this setting is only noticeable if the rolling interval is larger than one hour. <br />
-          This setting overrides the configuration setting for<code> <i>proxy.config.log2.rolling_offset_hr </i></code> in the <code> records.config</code> file. </p></td>
+          This setting overrides the configuration setting for<code> <i>proxy.config.log.rolling_offset_hr </i></code> in the <code> records.config</code> file. </p></td>
         </tr>
         <tr>
           <td><p><code>&lt;RollingSizeMb = &quot;size_in_MB&quot;/&gt;</code></p></td>
@@ -1944,7 +1944,7 @@ Setting user_id to 'root' or '#0' is now
           <td rowspan="1" colspan="3"><p><b>Logging Config</b></p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.logging_enabled </i></code></p>
+          <td><p><code><i>proxy.config.log.logging_enabled </i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>3</code></p></td>
           <td><p>Enables and disables event logging:</p>
@@ -1955,44 +1955,44 @@ Setting user_id to 'root' or '#0' is now
             <p>Refer to <a href="log.htm">Working with Log Files</a>.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.max_secs_per_buffer</i></code></p>
+          <td><p><code><i>proxy.config.log.max_secs_per_buffer</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>5</code></p></td>
           <td><p>The  maximum amount of time before data in the buffer is flushed to disk.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.max_space_mb_for_logs</i></code></p>
+          <td><p><code><i>proxy.config.log.max_space_mb_for_logs</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>2000</code></p></td>
           <td><p>The  amount of space allocated to the logging directory (in MB).</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.max_space_mb_for_orphan_logs</i></code></p>
+          <td><p><code><i>proxy.config.log.max_space_mb_for_orphan_logs</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>25</code></p></td>
           <td><p>The  amount of space allocated to the logging directory (in MB) if this node is acting as a collation client.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.max_space_mb_headroom</i></code></p>
+          <td><p><code><i>proxy.config.log.max_space_mb_headroom</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>10</code></p></td>
           <td><p>The  tolerance for the log space limit (in bytes). </p>
-          <p>If the variable <code><i>proxy.config.log2.auto_delete_rolled_file </i></code> is set to <code>1</code> (enabled), then autodeletion of log files is triggered when the amount of free space available in the logging directory is less than the value specified here.</p></td>
+          <p>If the variable <code><i>proxy.config.log.auto_delete_rolled_file </i></code> is set to <code>1</code> (enabled), then autodeletion of log files is triggered when the amount of free space available in the logging directory is less than the value specified here.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.hostname</i></code></p>
+          <td><p><code><i>proxy.config.log.hostname</i></code></p>
               <p><code>STRING </code></p></td>
           <td><p><code>localhost</code></p></td>
           <td><p>The  hostname of the machine running Traffic Server.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.logfile_dir </i></code></p>
+          <td><p><code><i>proxy.config.log.logfile_dir </i></code></p>
               <p><code>STRING</code></p></td>
           <td><p><code> install_dir  /logs </code></p></td>
           <td><p>The  full path to the logging directory.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.logfile_perm </i></code></p>
+          <td><p><code><i>proxy.config.log.logfile_perm </i></code></p>
               <p><code>STRING</code></p></td>
           <td><p><code>rw-r--r--</code></p></td>
           <td><p>The  log file permissions. The standard UNIX file permissions are used (owner, group, other). Permissable values are:</p>
@@ -2003,13 +2003,13 @@ Setting user_id to 'root' or '#0' is now
             <p>Permissions are subject to the umask settings for the Traffic Server process. This means that a umask setting of<code> 002 </code>will not allow write permission for others, even if specified in the configuration file. Permissions for existing log files are not changed when the configuration is changed.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.custom_logs_enabled </i></code></p>
+          <td><p><code><i>proxy.config.log.custom_logs_enabled </i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>0</code></p></td>
           <td><p>Enables (<code>1</code>) or disables (<code>0</code>) custom logging.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.xml_logs_config</i></code></p>
+          <td><p><code><i>proxy.config.log.xml_logs_config</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>1</code></p></td>
           <td><p>Enables (<code>1</code>) or disables (<code>0</code>) extended custom logging using an XML-based configuration file.<br />
@@ -2017,13 +2017,13 @@ Setting user_id to 'root' or '#0' is now
             <p><b>Note:</b> Although Traffic Server supports traditional custom logging,  you should use the more versatile XML-based custom formats.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.squid_log_enabled</i></code></p>
+          <td><p><code><i>proxy.config.log.squid_log_enabled</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>1</code></p></td>
           <td><p>Enables (<code>1</code>) or disables (<code>0</code>) the squid log file format.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.squid_log_is_ascii </i></code></p>
+          <td><p><code><i>proxy.config.log.squid_log_is_ascii </i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>1</code></p></td>
           <td><p>The  squid log file type:</p>
@@ -2031,25 +2031,25 @@ Setting user_id to 'root' or '#0' is now
             <code>0</code> = binary</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.squid_log_name </i></code></p>
+          <td><p><code><i>proxy.config.log.squid_log_name </i></code></p>
               <p><code>STRING</code></p></td>
           <td><p><code>squid</code></p></td>
           <td><p>The  squid log filename.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.squid_log_header </i></code></p>
+          <td><p><code><i>proxy.config.log.squid_log_header </i></code></p>
               <p><code>STRING</code></p></td>
           <td><p><code>NULL</code></p></td>
           <td><p>The  squid log file header text.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.common_log_enabled</i></code></p>
+          <td><p><code><i>proxy.config.log.common_log_enabled</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>0</code></p></td>
           <td><p>Enables (<code>1</code>) or disables (<code>0</code>) the Netscape common log file format.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.common_log_is_ascii</i></code></p>
+          <td><p><code><i>proxy.config.log.common_log_is_ascii</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>1</code></p></td>
           <td><p>The  Netscape common log file type:</p>
@@ -2057,25 +2057,25 @@ Setting user_id to 'root' or '#0' is now
             <code>0</code> = binary</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.common_log_name</i></code></p>
+          <td><p><code><i>proxy.config.log.common_log_name</i></code></p>
               <p><code>STRING</code></p></td>
           <td><p><code>common</code></p></td>
           <td><p>The  Netscape common log filename.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.common_log_header </i></code></p>
+          <td><p><code><i>proxy.config.log.common_log_header </i></code></p>
               <p><code>STRING</code></p></td>
           <td><p><code>NULL</code></p></td>
           <td><p>The  Netscape common log file header text.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.extended_log_enabled </i></code></p>
+          <td><p><code><i>proxy.config.log.extended_log_enabled </i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>0</code></p></td>
           <td><p>Enables (<code>1</code>) or disables (<code>0</code>) the Netscape extended log file format.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.confg.log2.extended_log_is_ascii</i></code></p>
+          <td><p><code><i>proxy.confg.log.extended_log_is_ascii</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>1</code></p></td>
           <td><p>The  Netscape extended log file type:</p>
@@ -2083,25 +2083,25 @@ Setting user_id to 'root' or '#0' is now
             <code>0</code> = binary</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.extended_log_name </i></code></p>
+          <td><p><code><i>proxy.config.log.extended_log_name </i></code></p>
               <p><code>STRING</code></p></td>
           <td><p><code>extended</code></p></td>
           <td><p>The  Netscape extended log filename.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.extended_log_header</i></code></p>
+          <td><p><code><i>proxy.config.log.extended_log_header</i></code></p>
               <p><code>STRING</code></p></td>
           <td><p><code>NULL</code></p></td>
           <td><p>The  Netscape extended log file header text.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.extended2_log_enabled</i></code></p>
+          <td><p><code><i>proxy.config.log.extended2_log_enabled</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>0</code></p></td>
           <td><p>Enables (<code>1</code>) or disables (<code>0</code>) the Netscape Extended-2 log file format.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.extended2_log_is_ascii </i></code></p>
+          <td><p><code><i>proxy.config.log.extended2_log_is_ascii </i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>1</code></p></td>
           <td><p>The  Netscape Extended-2 log file type:</p>
@@ -2109,32 +2109,32 @@ Setting user_id to 'root' or '#0' is now
             <code>0</code> = binary</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.extended2_log_name</i></code></p>
+          <td><p><code><i>proxy.config.log.extended2_log_name</i></code></p>
               <p><code>STRING </code></p></td>
           <td><p><code>extended2</code></p></td>
           <td><p>The  Netscape Extended-2 log filename.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.extended2_log_header </i></code></p>
+          <td><p><code><i>proxy.config.log.extended2_log_header </i></code></p>
               <p><code>STRING</code></p></td>
           <td><p><code>NULL</code></p></td>
           <td><p>The  Netscape Extended-2 log file header text.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.separate_icp_logs </i></code></p>
+          <td><p><code><i>proxy.config.log.separate_icp_logs </i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>0</code></p></td>
           <td><p>When enabled (<code>1</code>), configures Traffic Server to store ICP transactions in a separate log file.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.separate_host_logs </i></code></p>
+          <td><p><code><i>proxy.config.log.separate_host_logs </i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>0</code></p></td>
           <td><p>When enabled (<code>1</code>), configures Traffic Server to create a separate log file for HTTP transactions for each origin server listed in the <code> log_hosts.config</code> file.</p>
           <p>Refer to <a href="log.htm#HTTPHostLogSplitting">HTTP Host Log Splitting</a>.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.local.log2.collation_mode</i></code></p>
+          <td><p><code><i>proxy.local.log.collation_mode</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>0</code></p></td>
           <td><p>The  log collation mode:</p>
@@ -2147,72 +2147,72 @@ Setting user_id to 'root' or '#0' is now
             <p><b>Note:</b> Although Traffic Server supports traditional custom logging,  you should use the more versatile XML-based custom formats.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.confg.log2.collation_host</i></code></p>
+          <td><p><code><i>proxy.confg.log.collation_host</i></code></p>
               <p><code>STRING</code></p></td>
           <td><p><code>NULL</code></p></td>
           <td><p>The  hostname of the log collation server.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.collation_port</i></code></p>
+          <td><p><code><i>proxy.config.log.collation_port</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>8085</code></p></td>
           <td><p>The  port used for communication between the collation server and client.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.collation_secret</i></code></p>
+          <td><p><code><i>proxy.config.log.collation_secret</i></code></p>
               <p><code>STRING</code></p></td>
           <td><p><code>foobar</code></p></td>
           <td><p>The  password used to validate logging data and prevent the exchange of unauthorized information when a collation server is being used.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.collation_host_tagged </i></code></p>
+          <td><p><code><i>proxy.config.log.collation_host_tagged </i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>0</code></p></td>
           <td><p>When enabled (<code>1</code>), configures Traffic Server to include the hostname of the collation client that generated the log entry in each entry.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.collation_retry_sec</i></code></p>
+          <td><p><code><i>proxy.config.log.collation_retry_sec</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>5</code></p></td>
           <td><p>The  number of seconds between collation server connection retries.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.rolling_enabled</i></code></p>
+          <td><p><code><i>proxy.config.log.rolling_enabled</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>1</code></p></td>
           <td><p>Specifies how log files are rolled. You can specify the following values:</p>
               <p><code>0</code> = disables log file rolling</p>
-            <p><code>1</code> = enables log file rolling at specific intervals during the day (specified with the <code><i>proxy.config.log2.rolling_interval_sec</i></code> and <i><code>proxy.config.log2.rolling_offset_hr</code></i> variables)</p>
-            <p><code>2</code> = enables log file rolling when log files reach a specific size (specified with the <i><code>proxy.config.log2.rolling_size_mb</code></i> variable)</p>
+            <p><code>1</code> = enables log file rolling at specific intervals during the day (specified with the <code><i>proxy.config.log.rolling_interval_sec</i></code> and <i><code>proxy.config.log.rolling_offset_hr</code></i> variables)</p>
+            <p><code>2</code> = enables log file rolling when log files reach a specific size (specified with the <i><code>proxy.config.log.rolling_size_mb</code></i> variable)</p>
             <p><code>3</code> = enables log file rolling at specific intervals during the day or when log files reach a specific size (whichever occurs first)</p>
             <p><code>4</code> = enables log file rolling at specific intervals during the day when log files reach a specific size (i.e., at a specified time if the file is of the specified size)</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.rolling_interval_sec</i></code></p>
+          <td><p><code><i>proxy.config.log.rolling_interval_sec</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>86400</code></p></td>
           <td><p>The  log file rolling interval, in seconds. The minimum value is <code>300</code> (5 minutes). The maximum value is 86400 seconds (one day).</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.rolling_offset_hr</i></code></p>
+          <td><p><code><i>proxy.config.log.rolling_offset_hr</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>0</code></p></td>
           <td><p>The  file rolling offset hour. The hour of the day that starts the log rolling period. </p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.rolling_size_mb</i></code></p>
+          <td><p><code><i>proxy.config.log.rolling_size_mb</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>10</code></p></td>
           <td><p>The  size that log files must reach before rolling takes place.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.auto_delete_rolled_files</i></code></p>
+          <td><p><code><i>proxy.config.log.auto_delete_rolled_files</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>1</code></p></td>
           <td><p>Enables (<code>1</code>) or disables (<code>0</code>) automatic deletion of rolled files.</p></td>
         </tr>
         <tr>
-          <td><p><code><i>proxy.config.log2.sampling_frequency</i></code></p>
+          <td><p><code><i>proxy.config.log.sampling_frequency</i></code></p>
               <p><code>INT</code></p></td>
           <td><p><code>1</code></p></td>
           <td><p>Configures Traffic Server to log only a sample of transactions rather than every transaction. You can specify the following values:</p>

Modified: trafficserver/site/trunk/docs/v2/admin/log.htm
URL: http://svn.apache.org/viewvc/trafficserver/site/trunk/docs/v2/admin/log.htm?rev=1038684&r1=1038683&r2=1038684&view=diff
==============================================================================
--- trafficserver/site/trunk/docs/v2/admin/log.htm (original)
+++ trafficserver/site/trunk/docs/v2/admin/log.htm Wed Nov 24 16:46:59 2010
@@ -32,7 +32,7 @@
   System information logs observe a static format. Each log entry in the log contains information about the date and time the error was logged, the hostname of the Traffic Server that reported the error, and a description of the error or warning. <br />
   Refer to <a href="errors.htm">Traffic Server Error Messages</a> for a list of the  messages logged by Traffic Server. </li>
 </ul>
-<p>By default, Traffic Server creates both error and event log files and records system information in system log files. You can disable event logging and/or error logging by setting the configuration variable <code><i>proxy.config.log2.logging_enabled</i></code> (in the <code>records.config</code> file) to one of the following values: <ul> 
+<p>By default, Traffic Server creates both error and event log files and records system information in system log files. You can disable event logging and/or error logging by setting the configuration variable <code><i>proxy.config.log.logging_enabled</i></code> (in the <code>records.config</code> file) to one of the following values: <ul> 
 
   <li><code>0</code> to disable both event and error logging </li>
   <li><code>1</code> to enable error logging only </li>
@@ -82,17 +82,17 @@
       <th width="894" scope="col">Description</th>
     </tr>
     <tr>
-      <td><i><code>proxy.config.log2.logfile_dir</code></i></td>
+      <td><i><code>proxy.config.log.logfile_dir</code></i></td>
       <td>Specify the path to the directory in which you want to store event log files. This can be an absolute path or a path relative to the directory in which Traffic Server is installed. The default is <code>logs</code> located in the Traffic Server installation directory.<br />
       <b>Note:</b> The directory you specify must already exist.</td>
   </tr>
    <tr>
-      <td><i><code>proxy.config.log2.max_space_mb_for_logs</code></i></td>
+      <td><i><code>proxy.config.log.max_space_mb_for_logs</code></i></td>
       <td>Enter the maximum amount of space you want to allocate to the logging directory. The default value is 2000 MB.<br />
       <b>Note:</b> All files in the logging directory contribute to the space used, even if they are not log files.</td>
   </tr>
    <tr>
-      <td><i><code>proxy.config.log2.max_space_mb_headroom</code></i></td>
+      <td><i><code>proxy.config.log.max_space_mb_headroom</code></i></td>
       <td>Enter the tolerance for the log space limit. The default value is 10 MB.</td>
   </tr>
 </table>
@@ -121,19 +121,19 @@ Event log files consume substantial disk
       <th width="894" scope="col">Description</th>
     </tr>
     <tr>
-      <td><code><i>proxy.config.log2.squid_log_enabled</i></code></td>
+      <td><code><i>proxy.config.log.squid_log_enabled</i></code></td>
       <td>Set this variable to 1 to enable the Squid log file format.</td>
   </tr>
   <tr>
-      <td><code><i>proxy.config.log2.squid_log_is_ascii</i></code></td>
+      <td><code><i>proxy.config.log.squid_log_is_ascii</i></code></td>
       <td>Set this variable to 1 to enable ASCII mode.<br />Set this variable to 0 to enable binary mode.</td>
   </tr>
   <tr>
-      <td><code><i>proxy.config.log2.squid_log_name</i></code></td>
+      <td><code><i>proxy.config.log.squid_log_name</i></code></td>
       <td>Enter the name you want to use for Squid event log files. The default is <code>squid</code>.</td>
   </tr>
   <tr>
-      <td><code><i>proxy.config.log2.squid_log_header</i></code></td>
+      <td><code><i>proxy.config.log.squid_log_header</i></code></td>
       <td>Enter the header text you want to display at the top of the Squid log files. Enter <code>NULL</code> if you do not want to use a header. </td>
   </tr>
 </table>
@@ -144,19 +144,19 @@ Event log files consume substantial disk
       <th width="894" scope="col">Description</th>
     </tr>
     <tr>
-      <td><code><i>proxy.config.log2.common_log_enabled</i></code></td>
+      <td><code><i>proxy.config.log.common_log_enabled</i></code></td>
       <td>Set this variable to 1 to enable the Netscape Common log file format.</td>
   </tr>
   <tr>
-      <td><code>proxy.config.log2.common_log_is_ascii</code></td>
+      <td><code>proxy.config.log.common_log_is_ascii</code></td>
       <td>Set this variable to 1 to enable ASCII mode.<br />Set this variable to 0 to enable binary mode.</td>
   </tr>
   <tr>
-      <td><code><i>proxy.config.log2.common_log_name</i></code></td>
+      <td><code><i>proxy.config.log.common_log_name</i></code></td>
       <td>Enter the name you want to use for Netscape Common event log files. The default is <code>common</code>.</td>
   </tr>
   <tr>
-      <td><code><i>proxy.config.log2.common_log_header</i></code></td>
+      <td><code><i>proxy.config.log.common_log_header</i></code></td>
       <td>Enter the header text you want to display at the top of the Netscape Common log files. Enter <code>NULL</code> if you do not want to use a header.</td>
   </tr>
 </table>
@@ -167,19 +167,19 @@ Event log files consume substantial disk
       <th width="894" scope="col">Description</th>
     </tr>
     <tr>
-      <td><code><i>proxy.config.log2.extended_log_enabled</i></code></td>
+      <td><code><i>proxy.config.log.extended_log_enabled</i></code></td>
       <td>Set this variable to 1 to enable the Netscape Extended log file format.</td>
   </tr>
   <tr>
-      <td><code><i>proxy.config.log2.extended_log_is_ascii</i></code></td>
+      <td><code><i>proxy.config.log.extended_log_is_ascii</i></code></td>
       <td>Set this variable to 1 to enable ASCII mode.<br />Set this variable to 0 to enable binary mode.</td>
   </tr>
   <tr>
-      <td><code><i>proxy.config.log2.extended_log_name</i></code></td>
+      <td><code><i>proxy.config.log.extended_log_name</i></code></td>
       <td>Enter the name you want to use for Netscape Extended event log files. The default is <code>extended</code>.</td>
   </tr>
   <tr>
-      <td><code><i>proxy.config.log2.extended_log_header</i></code></td>
+      <td><code><i>proxy.config.log.extended_log_header</i></code></td>
       <td>Enter the header text you want to display at the top of the Netscape Extended log files. Enter <code>NULL</code> if you do not want to use a header.</td>
   </tr>
 </table>
@@ -190,19 +190,19 @@ Event log files consume substantial disk
       <th width="894" scope="col">Description</th>
     </tr>
     <tr>
-      <td><code><i>proxy.config.log2.extended2_log_enabled</i></code></td>
+      <td><code><i>proxy.config.log.extended2_log_enabled</i></code></td>
       <td>Set this variable to 1 to enable the Netscape Extended-2 log file format.</td>
   </tr>
    <tr>
-      <td><code><i>proxy.config.log2.extended2_log_is_ascii</i></code></td>
+      <td><code><i>proxy.config.log.extended2_log_is_ascii</i></code></td>
       <td>Set this variable to 1 to enable ASCII mode.<br />Set this variable to 0 to enable binary mode.</td>
   </tr>
    <tr>
-      <td><code><i>proxy.config.log2.extended2_log_name</i></code></td>
+      <td><code><i>proxy.config.log.extended2_log_name</i></code></td>
       <td>Enter the name you want to use for Netscape Extended-2 event log files. The default is <code>extended2</code>.</td>
   </tr>
    <tr>
-      <td><code><i>proxy.config.log2.extended2_log_header</i></code></td>
+      <td><code><i>proxy.config.log.extended2_log_header</i></code></td>
       <td>Enter the header text you want to display at the top of the Netscape Extended-2 log files. Enter <code>NULL</code> if you do not want to use a header.</td>
   </tr>
 </table>
@@ -240,11 +240,11 @@ Event log files consume substantial disk
       <th width="894" scope="col">Description</th>
     </tr>
     <tr>
-      <td><code><i>proxy.config.log2.custom_logs_enabled</i></code></td>
+      <td><code><i>proxy.config.log.custom_logs_enabled</i></code></td>
       <td>Set this variable to 1 to enable custom logging.</td>
   </tr>
   <tr>
-      <td><code><i>proxy.config.log2.xml_logs_config</i></code></td>
+      <td><code><i>proxy.config.log.xml_logs_config</i></code></td>
       <td>Make sure this variable is set to 1 (the default value).</td>
   </tr>
 </table>
@@ -414,7 +414,7 @@ The logging system buffers log records b
       <th width="894" scope="col">Description</th>
     </tr>
     <tr>
-      <td><code><i>proxy.config.log2.rolling_enabled</i></code></td>
+      <td><code><i>proxy.config.log.rolling_enabled</i></code></td>
       <td>Set this variable to one of the following values:<br />
       <code><b>1</b></code> to enable log file rolling at specific intervals during the day.<br />
       <code><b>2</b></code> to enable log file rolling when log files reach a specific size.<br />
@@ -422,19 +422,19 @@ The logging system buffers log records b
       <code><b>4</b></code> to enable log file rolling at specific intervals during the day when log files reach a specific size (at a specified time if the file is of the specified size).</td>
   </tr>
   <tr>
-      <td><code><i>proxy.config.log2.rolling_size_mb</i></code></td>
+      <td><code><i>proxy.config.log.rolling_size_mb</i></code></td>
       <td>Specifies the size that log files must reach before rolling takes place.</td>
   </tr>
   <tr>
-      <td><code><i>proxy.config.log2.rolling_offset_hr</i></code></td>
+      <td><code><i>proxy.config.log.rolling_offset_hr</i></code></td>
       <td>Set this variable to the specific time each day you want log file rolling to take place. Traffic Server forces the log file to be rolled at the offset hour each day.</td>
   </tr>
   <tr>
-      <td><code><i>proxy.config.log2.rolling_interval_sec</i></code></td>
+      <td><code><i>proxy.config.log.rolling_interval_sec</i></code></td>
       <td>Set this variable to the rolling interval in seconds. The minimum value is 300 seconds (5 minutes). The maximum value is 86400 seconds (one day).<b> Note:</b> If you start Traffic Server within a few minutes of the next rolling time, then rolling might not occur until the next rolling time.</td>
   </tr>
   <tr>
-      <td><code><i>proxy.config.log2.auto_delete_rolled_file</i></code></td>
+      <td><code><i>proxy.config.log.auto_delete_rolled_file</i></code></td>
       <td>Set this variable to 1 to enable autodeletion of rolled files.</td>
   </tr>
 </table>
@@ -507,11 +507,11 @@ The logging system buffers log records b
       <th width="894" scope="col">Description</th>
     </tr>
     <tr>
-      <td><code><i>proxy.config.log2.separate_icp_logs</i></code></td>
+      <td><code><i>proxy.config.log.separate_icp_logs</i></code></td>
       <td>Set this variable to 1 to record all ICP transactions in a separate log file. <br /> Set this variable to 0 to record all ICP transactions in the same log file as HTTP   transactions. <br /> Set this variable to -1 to filter all ICP transactions from the standard log files.</td>
   </tr>
   <tr>
-      <td><code><i>proxy.config.log2.separate_host_logs</i></code></td>
+      <td><code><i>proxy.config.log.separate_host_logs</i></code></td>
       <td>Set this variable to 1 to record HTTP   transactions for each host listed in <code>log_hosts.config</code> file in a separate log file. <br />        Set this variable to 0 to record all HTTP transactions (for each host listed in  <code>log_hosts.config</code>) in the same log file.</td>
   </tr>
 </table>
@@ -561,15 +561,15 @@ Collating Event Log Files</h2>
       <th width="894" scope="col">Description</th>
     </tr>
     <tr>
-      <td><code><i>proxy.config.log2.collation_mode</i></code></td>
+      <td><code><i>proxy.config.log.collation_mode</i></code></td>
       <td>Set this variable to 1 to set this Traffic Server node as a log collation server.</td>
   </tr>
   <tr>
-      <td><code><i>proxy.config.log2.collation_port</i></code></td>
+      <td><code><i>proxy.config.log.collation_port</i></code></td>
       <td>Set this variable to specify the port number used for communication with collation clients. The default port number is 8085.</td>
   </tr>
   <tr>
-      <td><code><i>proxy.config.log2.collation_secret</i></code></td>
+      <td><code><i>proxy.config.log.collation_secret</i></code></td>
       <td>Set this variable to specify the password used to validate logging data and prevent the exchange of arbitrary information.<br />All collation clients must use this same secret.</td>
   </tr>
 </table>
@@ -596,7 +596,7 @@ Collating Event Log Files</h2>
       <th width="894" scope="col">Description</th>
     </tr>
     <tr>
-      <td><code><i>proxy.config.log2.logfile_dir</i></code></td>
+      <td><code><i>proxy.config.log.logfile_dir</i></code></td>
       <td>Set this variable to specify the directory on which you want to store the log files. You can specify an absolute path to the directory or a path relative to the directory from which the <code>sac<code> binary is executed.<br />Note: The directory must already exist on the machine serving as the standalone collator.</code></code></td>
   </tr>
 </table>
@@ -616,27 +616,27 @@ Collating Event Log Files</h2>
       <th width="894" scope="col">Description</th>
     </tr>
     <tr>
-      <td><code><i>proxy.config.log2.collation_mode</i></code></td>
+      <td><code><i>proxy.config.log.collation_mode</i></code></td>
       <td>Set this variable to 2 to configure this Traffic Server node to be a log collation client and send standard formatted log entries to the collation server.<br />To send custom XML-based formatted log entries to the collation server, you must add a log object specification to the <code>logs_xml.config</code> file; refer to <a href="#UsingCustomFormat">Using the Custom Format</a>.</td>
   </tr>
    <tr>
-      <td><code><i>proxy.config.log2.collation_host</i></code></td>
+      <td><code><i>proxy.config.log.collation_host</i></code></td>
       <td>Hostname of the collation server.</td>
   </tr>
    <tr>
-      <td><code><i>proxy.config.log2.collation_port</i></code></td>
+      <td><code><i>proxy.config.log.collation_port</i></code></td>
       <td>The port used for communication with the collation server. The default port number is 8085.</td>
   </tr>
    <tr>
-      <td><code><i>proxy.config.log2.collation_secret</i></code></td>
+      <td><code><i>proxy.config.log.collation_secret</i></code></td>
       <td>The password used to validate logging data and prevent the exchange of arbitrary information.</td>
   </tr>
    <tr>
-      <td><code><i>proxy.config.log2.collation_host_tagged</i></code></td>
+      <td><code><i>proxy.config.log.collation_host_tagged</i></code></td>
       <td>Set this variable to 1 if you want the hostname of the collation client that generated the log entry to be included in each entry.<br />Set this variable to 0 if you do not want the hostname of the collation client that generated the log entry to be included in each entry.</td>
   </tr>
    <tr>
-      <td><code><i>proxy.config.log2.max_space_mb_for_orphan_logs</i></code></td>
+      <td><code><i>proxy.config.log.max_space_mb_for_orphan_logs</i></code></td>
       <td>Set this variable to specify the maximum amount of space (in megabytes) you want to allocate to the logging directory on the collation client for storing orphan log files. Orphan log files are created when the log collation server cannot be contacted. The default value is 25 MB.</td>
   </tr>
 </table>
@@ -883,11 +883,11 @@ Collating Event Log Files</h2>
       <th width="894" scope="col">Description</th>
     </tr>
     <tr>
-      <td><code><i>proxy.config.log2.custom_logs_enabled	</i></code></td>
+      <td><code><i>proxy.config.log.custom_logs_enabled	</i></code></td>
       <td>Set this variable to 1 to enable custom logging.</td>
   </tr>
    <tr>
-      <td><code><i>proxy.config.log2.xml_logs_config</i></code></td>
+      <td><code><i>proxy.config.log.xml_logs_config</i></code></td>
       <td>Set this variable to 0 to disable XML-based custom logging.</td>
   </tr>
 </table>
@@ -908,23 +908,23 @@ Collating Event Log Files</h2>
       <th width="894" scope="col">Description</th>
     </tr>
     <tr>
-      <td><code><i>proxy.config.log2.collation_mode</i></code></td>
+      <td><code><i>proxy.config.log.collation_mode</i></code></td>
       <td>Set this variable to 3 to configure this Traffic Server node to be a log collation client and send log entries in  traditional custom formats to the collation server.<br />        Set this variable to 4 to configure this Traffic Server node to be a log collation client and send log entries in both  standard formats (Squid, Netscape) and  traditional custom formats to the collation server.</td>
   </tr>
    <tr>
-      <td><code><i>proxy.config.log2.collation_host</i></code></td>
+      <td><code><i>proxy.config.log.collation_host</i></code></td>
       <td>Specify the hostname of the collation server.</td>
   </tr>
   <tr>
-      <td><code><i>proxy.config.log2.collation_port</i></code></td>
+      <td><code><i>proxy.config.log.collation_port</i></code></td>
       <td>Specify the port Traffic Server uses to communicate with the collation server. The default port number is 8085.</td>
   </tr>
    <tr>
-      <td><code><i>proxy.config.log2.collation_secret</i></code></td>
+      <td><code><i>proxy.config.log.collation_secret</i></code></td>
       <td>Specify the password used to validate logging data and prevent  exchange of arbitrary information.</td>
   </tr>
    <tr>
-      <td><code><i>proxy.config.log2.collation_host_tagged</i></code></td>
+      <td><code><i>proxy.config.log.collation_host_tagged</i></code></td>
       <td>Set this variable to 1 if you want the hostname of the collation client that generated the log entry to be included in each entry.<br />Set this variable to 0 if you do not want the hostname of the collation client that generated the log entry to be included in each entry. </td>
   </tr>
 </table>

Modified: trafficserver/site/trunk/docs/v2/admin/trouble.htm
URL: http://svn.apache.org/viewvc/trafficserver/site/trunk/docs/v2/admin/trouble.htm?rev=1038684&r1=1038683&r2=1038684&view=diff
==============================================================================
--- trafficserver/site/trunk/docs/v2/admin/trouble.htm (original)
+++ trafficserver/site/trunk/docs/v2/admin/trouble.htm Wed Nov 24 16:46:59 2010
@@ -807,13 +807,13 @@ file configures Traffic Server in transp
   logs</code>
   directory.</li> 
 <li>Check the location of  log files by checking the value of the variable <code>
-  <i>proxy.config.log2.logfile_dir </i></code>  in the <code>
+  <i>proxy.config.log.logfile_dir </i></code>  in the <code>
   records.config</code>
 file. </li><li>Check that the log directory has read/write permissions for the Traffic Server user account. If the log directory does not have the correct permissions, then the <code>
   traffic_server</code>
 process is unable to open or create log files.</li>
 <li>Check that logging is enabled by checking the value of the  <code>
-  <i>proxy.config.log2.logging_enabled </i></code>variable  in the <code>
+  <i>proxy.config.log.logging_enabled </i></code>variable  in the <code>
   records.config</code>
 file. </li>
 <li>Check that a log format is enabled. In the <code>