You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2010/01/24 17:59:16 UTC
svn commit: r902601 - in /jakarta/jmeter/trunk:
src/components/org/apache/jmeter/reporters/MailerModel.java
src/components/org/apache/jmeter/reporters/MailerResultCollector.java
xdocs/changes.xml
Author: sebb
Date: Sun Jan 24 16:59:16 2010
New Revision: 902601
URL: http://svn.apache.org/viewvc?rev=902601&view=rev
Log:
Bug 48603 - Mailer Visualiser sends two emails for a single failed response
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerResultCollector.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java?rev=902601&r1=902600&r2=902601&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java Sun Jan 24 16:59:16 2010
@@ -94,6 +94,7 @@
changeListener = list;
}
+ /** {@inheritDoc} */
@Override
public Object clone() {
MailerModel m = (MailerModel) super.clone();
@@ -139,16 +140,28 @@
}
/**
+ * Adds a SampleResult for display in the Visualizer.
+ *
+ * @param sample
+ * the SampleResult encapsulating informations about the last
+ * sample.
+ */
+ public void add(SampleResult sample) {
+ add(sample, false);
+ }
+
+ /**
* Adds a SampleResult. If SampleResult represents a change concerning the
- * failure/success of the sampling a message might be send to the addressies
+ * failure/success of the sampling a message might be sent to the addressies
* according to the settings of <code>successCount</code> and
* <code>failureCount</code>.
*
* @param sample
- * the SampleResult encapsulating informations about the last
+ * the SampleResult encapsulating information about the last
* sample.
+ * @param sendMails whether or not to send e-mails
*/
- public synchronized void add(SampleResult sample) {
+ public synchronized void add(SampleResult sample, boolean sendMails) {
// -1 is the code for a failed sample.
//
@@ -159,7 +172,7 @@
successCount++;
}
- if ((failureCount > getFailureLimit()) && !siteDown && !failureMsgSent) {
+ if (sendMails && (failureCount > getFailureLimit()) && !siteDown && !failureMsgSent) {
// Send the mail ...
Vector<String> addressVector = getAddressVector();
@@ -168,7 +181,7 @@
sendMail(getFromAddress(), addressVector, getFailureSubject(), "URL Failed: "
+ sample.getSampleLabel(), getSmtpHost());
} catch (Exception e) {
- log.error("Problem sending mail", e);
+ log.error("Problem sending mail: "+e);
}
siteDown = true;
failureMsgSent = true;
@@ -177,7 +190,7 @@
}
}
- if (siteDown && (sample.getTime() != -1) && !successMsgSent) {
+ if (sendMails && siteDown && (sample.getTime() != -1) && !successMsgSent) {
// Send the mail ...
if (successCount > getSuccessLimit()) {
Vector<String> addressVector = getAddressVector();
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerResultCollector.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerResultCollector.java?rev=902601&r1=902600&r2=902601&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerResultCollector.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerResultCollector.java Sun Jan 24 16:59:16 2010
@@ -32,21 +32,18 @@
setProperty(new TestElementProperty(MAILER_MODEL, new MailerModel()));
}
+ /** {@inheritDoc} */
@Override
public void clear() {
super.clear();
setProperty(new TestElementProperty(MAILER_MODEL, new MailerModel()));
}
- /*
- * (non-Javadoc)
- *
- * @see SampleListener#sampleOccurred(SampleEvent)
- */
+ /** {@inheritDoc} */
@Override
public void sampleOccurred(SampleEvent e) {
- super.sampleOccurred(e);
- getMailerModel().add(e.getResult());
+ super.sampleOccurred(e); // sends the result to the visualiser
+ getMailerModel().add(e.getResult(), true); // updates the model used for sending e-mails
}
public MailerModel getMailerModel() {
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=902601&r1=902600&r2=902601&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Sun Jan 24 16:59:16 2010
@@ -99,6 +99,7 @@
<h3>Listeners</h3>
<ul>
+<li>Bug 48603 - Mailer Visualiser sends two emails for a single failed response</li>
</ul>
<h3>Assertions</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org