You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2014/09/07 21:50:07 UTC

svn commit: r1623149 - in /jmeter/trunk: bin/jmeter.properties src/core/org/apache/jmeter/gui/LoggerPanel.java src/core/org/apache/jmeter/gui/MainFrame.java xdocs/changes.xml xdocs/usermanual/hints_and_tips.xml

Author: pmouawad
Date: Sun Sep  7 19:50:07 2014
New Revision: 1623149

URL: http://svn.apache.org/r1623149
Log:
Bug 56920 - LogViewer : Make it receive all log events even when it is closed
Bugzilla Id: 56920

Modified:
    jmeter/trunk/bin/jmeter.properties
    jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
    jmeter/trunk/xdocs/changes.xml
    jmeter/trunk/xdocs/usermanual/hints_and_tips.xml

Modified: jmeter/trunk/bin/jmeter.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1623149&r1=1623148&r2=1623149&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Sun Sep  7 19:50:07 2014
@@ -129,6 +129,12 @@ jmeter.laf.mac=System
 # default to false
 #jmeter.loggerpanel.display=false
 
+# Enable LogViewer Panel to receive log event even if closed
+# Enabled since 2.12
+# Note this has some impact on performances, but as GUI mode must
+# not be used for Load Test it is acceptable
+#jmeter.loggerpanel.enable_when_closed=true
+
 # Error/Fatal Log count display
 # defaults to true
 #jmeter.errorscounter.display=true

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java?rev=1623149&r1=1623148&r2=1623149&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java Sun Sep  7 19:50:07 2014
@@ -49,6 +49,10 @@ public class LoggerPanel extends JPanel 
     private static final int LOGGER_PANEL_MAX_LENGTH =
             JMeterUtils.getPropDefault("jmeter.loggerpanel.maxlength", 80000); // $NON-NLS-1$
 
+    // Make panel handle event even if closed
+    private static final boolean LOGGER_PANEL_RECEIVE_WHEN_CLOSED =
+            JMeterUtils.getPropDefault("jmeter.loggerpanel.enable_when_closed", true); // $NON-NLS-1$
+
     /**
      * Pane for display JMeter log file
      */
@@ -78,7 +82,7 @@ public class LoggerPanel extends JPanel 
      */
     @Override
     public void processEvent(final LogEvent logEvent) {
-        if(!GuiPackage.getInstance().getMenuItemLoggerPanel().getModel().isSelected()) {
+        if(!LOGGER_PANEL_RECEIVE_WHEN_CLOSED && !GuiPackage.getInstance().getMenuItemLoggerPanel().getModel().isSelected()) {
             return;
         }
         

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java?rev=1623149&r1=1623148&r2=1623149&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java Sun Sep  7 19:50:07 2014
@@ -20,6 +20,7 @@ package org.apache.jmeter.gui;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Insets;
@@ -204,7 +205,8 @@ public class MainFrame extends JFrame im
         warnIndicator.setOpaque(false);
         warnIndicator.setContentAreaFilled(false);
         warnIndicator.setBorderPainted(false);
-
+        warnIndicator.setCursor(new Cursor(Cursor.HAND_CURSOR));
+        
         warnIndicator.setToolTipText(JMeterUtils.getResString("error_indicator_tooltip")); // $NON-NLS-1$
         warnIndicator.addActionListener(this);
         errorsOrFatalsLabel = new JLabel("0"); // $NON-NLS-1$

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1623149&r1=1623148&r2=1623149&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Sep  7 19:50:07 2014
@@ -125,8 +125,9 @@ jmeter.gui.action.LookAndFeelCommand: Us
 
 <ul>
 <li>Since JMeter 2.12, Mail Reader Sampler will show 1 for number of samples instead of number of messages retrieved, see <bugzilla>56539</bugzilla></li>
-<li>Since JMeter 2.12, when using Cache Manager, if resource is found in cache no SampleResult will be created, in previous version a SampleResult with empty content and 204 return code was returned, see <bugzilla>54778</bugzilla>.
-</li>
+<li>Since JMeter 2.12, when using Cache Manager, if resource is found in cache no SampleResult will be created, in previous version a SampleResult with empty content and 204 return code was returned, see <bugzilla>54778</bugzilla>.</li>
+<li>Since JMeter 2.12, Log Viewer will no more clear logs when closed and will have logs available even if closed. See <bugzilla>56920</bugzilla>. Read <a href="./usermanual/hints_and_tips.html#debug_logging">Hints and Tips &gt; Enabling Debug logging</a>
+for details on configuring this component.</li>
 </ul>
 
 <!-- =================== Bug fixes =================== -->
@@ -257,6 +258,7 @@ jmeter.gui.action.LookAndFeelCommand: Us
 <li><bugzilla>56807</bugzilla> - Ability to force flush of ResultCollector file. Contributed by Andrey Pohilko (apc4 at ya.ru)</li>
 <li><bugzilla>56921</bugzilla> - Templates : Improve Recording template to ignore embedded resources case and URL parameters. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
 <li><bugzilla>42248</bugzilla> - Undo-redo support on Test Plan tree modification. Developed by Andrey Pohilko (apc4 at ya.ru) and contributed by BlazeMeter Ltd.</li></ul>
+<li><bugzilla>56920</bugzilla> - LogViewer : Make it receive all log events even when it is closed. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
 
 <ch_section>Non-functional changes</ch_section>
 <ul>

Modified: jmeter/trunk/xdocs/usermanual/hints_and_tips.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/hints_and_tips.xml?rev=1623149&r1=1623148&r2=1623149&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/hints_and_tips.xml (original)
+++ jmeter/trunk/xdocs/usermanual/hints_and_tips.xml Sun Sep  7 19:50:07 2014
@@ -66,13 +66,20 @@ You can use these to determine the corre
 <p>
 It is sometimes very useful to see Log messages to debug dynamic scripting languages like BeanShell or
 groovy used in JMeter.
-Since 2.6, you can view log messages directly in JMeter GUI, to do so, use menu Options &gt; Log Viewer,
-a log console will appear at the bottom of the interface.
-Note that log messages are cleared each time you disable this option.
+Since version 2.6, you can view log messages directly in JMeter GUI, to do so:
+<ul>
+<li>use menu Options &gt; Log Viewer, a log console will appear at the bottom of the interface</li>
+<li>Or click on the Warning icon in the upper right corner of GUI</li>
+</ul>
 By default this log console is disabled, you can enable it by changing in jmeter.properties:
 <ul>
 <li>jmeter.loggerpanel.display=true</li>
 </ul>
+
+To avoid using too much memory, this components limits the number of characters used by this panel:
+<ul>
+<li>jmeter.loggerpanel.maxlength=80000</li>
+</ul>
 </p>
 </subsection>