You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2019/12/22 12:24:32 UTC

[jmeter] branch master updated (d33386e -> e1dbaec)

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.


    from d33386e  Upgrade Gradle-RAT plugin: 0.5.2 -> 0.5.3
     new ffe5252  Update Log level FATAL and OFF
     new e1dbaec  Markup for Log level documentation

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 xdocs/changes.xml                |  2 ++
 xdocs/usermanual/get-started.xml | 41 ++++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 21 deletions(-)


[jmeter] 02/02: Markup for Log level documentation

Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit e1dbaec5fd3259283517b500c561c2ba47d22eff
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sun Dec 22 13:23:23 2019 +0100

    Markup for Log level documentation
---
 xdocs/usermanual/get-started.xml | 42 +++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/xdocs/usermanual/get-started.xml b/xdocs/usermanual/get-started.xml
index 54368a3..5c0ab63 100644
--- a/xdocs/usermanual/get-started.xml
+++ b/xdocs/usermanual/get-started.xml
@@ -656,35 +656,33 @@ LoggerFactory.getLogger(Foo.class);</source>
           <td>
             Old Log Levels:
             <ul>
-              <li>DEBUG</li>
-              <li>INFO</li>
-              <li>WARN</li>
-              <li>ERROR</li>
-              <li>FATAL_ERROR</li>
-              <li>NONE</li>
+              <li><code>DEBUG</code></li>
+              <li><code>INFO</code></li>
+              <li><code>WARN</code></li>
+              <li><code>ERROR</code></li>
+              <li><code>FATAL_ERROR</code></li>
+              <li><code>NONE</code></li>
             </ul>
           </td>
           <td>
             Mapping to New Levels through SLF4J/Log4j2:
             <ul>
-              <li>DEBUG</li>
-              <li>INFO</li>
-              <li>WARN</li>
-              <li>ERROR</li>
-              <li>ERROR</li>
-              <li>OFF</li>
+              <li><code>DEBUG</code></li>
+              <li><code>INFO</code></li>
+              <li><code>WARN</code></li>
+              <li><code>ERROR</code></li>
+              <li><code>ERROR</code></li>
+              <li><code>OFF</code></li>
             </ul>
-            <div>
-              <em><b>Note:</b></em>
-              Since 'FATAL_ERROR' is not supported by SLF4J API,
-              it is treated as 'ERROR' instead for existing code not to break.
-              There's also 'FATAL' log level option.
-            </div>
-            <div>
-              <em><b>Note:</b></em>
-              'TRACE' level, which is less specific than 'DEBUG', is supported additionally since 3.2.
+            <note>
+              Since <code>FATAL_ERROR</code> is not supported by SLF4J API,
+              it is treated as <code>ERROR</code> instead for existing code not to break.
+              There is also the <code>FATAL</code> log level option.
+            </note>
+            <note>
+              <code>TRACE</code> level, which is less specific than <code>DEBUG</code>, is supported additionally since 3.2.
               Look up SLF4J or Apache Log4J 2 documentations for details.
-            </div>
+            </note>
           </td>
         </tr>
       </tbody>


[jmeter] 01/02: Update Log level FATAL and OFF

Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit ffe525200c57f56d54c8d70125fa8774ae5185a7
Author: jmetertea <33...@users.noreply.github.com>
AuthorDate: Tue Dec 17 10:05:01 2019 +0200

    Update Log level FATAL and OFF
    
    asked first in https://stackoverflow.com/questions/57264142/jmeter-ignore-fatal-off-log-levels
    
    Closes #547
---
 xdocs/changes.xml                | 2 ++
 xdocs/usermanual/get-started.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index a2d67e0..1517e81 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -159,6 +159,7 @@ to view the last release notes of version 5.2.1.
 
 <h3>Documentation</h3>
 <ul>
+  <li><pr>547</pr>Correct Log level documentation. Contributed by jmetertea</li>
 </ul>
 
 <h3>General</h3>
@@ -177,6 +178,7 @@ to view the last release notes of version 5.2.1.
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>
   <li>Michael McDermott (mcdermott.michaelj at gmail.com)</li>
+  <li>jmetertea</li>
 </ul>
 <p>
 Apologies if we have omitted anyone else.
diff --git a/xdocs/usermanual/get-started.xml b/xdocs/usermanual/get-started.xml
index b00ce37..54368a3 100644
--- a/xdocs/usermanual/get-started.xml
+++ b/xdocs/usermanual/get-started.xml
@@ -672,12 +672,13 @@ LoggerFactory.getLogger(Foo.class);</source>
               <li>WARN</li>
               <li>ERROR</li>
               <li>ERROR</li>
-              <li>NONE</li>
+              <li>OFF</li>
             </ul>
             <div>
               <em><b>Note:</b></em>
               Since 'FATAL_ERROR' is not supported by SLF4J API,
               it is treated as 'ERROR' instead for existing code not to break.
+              There's also 'FATAL' log level option.
             </div>
             <div>
               <em><b>Note:</b></em>