You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2018/07/25 02:59:08 UTC
[27/29] james-project git commit: JAMES-2469 Remove unused spam
processor from configurations
JAMES-2469 Remove unused spam processor from configurations
This implied a penalty in James boot time
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/faf21d93
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/faf21d93
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/faf21d93
Branch: refs/heads/master
Commit: faf21d93cc056243969790c31332735512ae01aa
Parents: aaf1299
Author: benwa <bt...@linagora.com>
Authored: Tue Jul 17 10:32:37 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:49 2018 +0700
----------------------------------------------------------------------
.../destination/conf/mailetcontainer.xml | 9 ------
.../destination/conf/mailetcontainer.xml | 9 ------
.../jpa/destination/conf/mailetcontainer.xml | 9 ------
.../spring/destination/conf/mailetcontainer.xml | 9 ------
.../src/test/resources/mailetcontainer.xml | 6 ----
.../src/test/resources/mailetcontainer.xml | 6 ----
.../src/test/resources/mailetcontainer.xml | 6 ----
.../src/test/resources/mailetcontainer.xml | 6 ----
.../sample-configuration/mailetcontainer.xml | 31 --------------------
.../sample-configuration/mailetcontainer.xml | 31 --------------------
.../sample-configuration/mailetcontainer.xml | 6 ----
.../src/test/resources/mailetcontainer.xml | 6 ----
.../src/test/resources/mailetcontainer.xml | 6 ----
.../WebAdminServerIntegrationTest.java | 2 --
.../src/test/resources/mailetcontainer.xml | 6 ----
15 files changed, 148 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
index 353dea9..d00a4a5 100644
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
@@ -103,15 +103,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="true">
- <mailet match="All" class="MetricsMailet">
- <metricName>mailetContainerSpam</metricName>
- </mailet>
- <mailet match="All" class="ToRepository">
- <repositoryPath>cassandra://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="true">
<mailet match="All" class="MetricsMailet">
<metricName>mailetContainerLocalAddressError</metricName>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
index a8de354..8a154e9 100644
--- a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
@@ -102,15 +102,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="true">
- <mailet match="All" class="MetricsMailet">
- <metricName>mailetContainerSpam</metricName>
- </mailet>
- <mailet match="All" class="ToRepository">
- <repositoryPath>cassandra://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="true">
<mailet match="All" class="MetricsMailet">
<metricName>mailetContainerLocalAddressError</metricName>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
index 27bbd4b..e7df363 100644
--- a/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
@@ -97,15 +97,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="true">
- <mailet match="All" class="MetricsMailet">
- <metricName>mailetContainerSpam</metricName>
- </mailet>
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="true">
<mailet match="All" class="MetricsMailet">
<metricName>mailetContainerLocalAddressError</metricName>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/spring/destination/conf/mailetcontainer.xml b/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
index 9e404be..d1f51c1 100644
--- a/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
@@ -101,15 +101,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="true">
- <mailet match="All" class="MetricsMailet">
- <metricName>mailetContainerSpam</metricName>
- </mailet>
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="true">
<mailet match="All" class="MetricsMailet">
<metricName>mailetContainerLocalAddressError</metricName>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/container/cli-integration/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/cli-integration/src/test/resources/mailetcontainer.xml b/server/container/cli-integration/src/test/resources/mailetcontainer.xml
index fce9722..417b9e4 100644
--- a/server/container/cli-integration/src/test/resources/mailetcontainer.xml
+++ b/server/container/cli-integration/src/test/resources/mailetcontainer.xml
@@ -82,12 +82,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="false">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="false">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml
index 7605951..2365c7c 100644
--- a/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml
+++ b/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml
@@ -93,12 +93,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="false">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="false">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
index 2c8ea18..298fd52 100644
--- a/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
+++ b/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
@@ -81,12 +81,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="false">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="false">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml
index cdf3ef8..f68b1a2 100644
--- a/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml
+++ b/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml
@@ -82,12 +82,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="false">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="false">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml b/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml
index 8ad6c2c..d3a81be 100644
--- a/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml
+++ b/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml
@@ -33,31 +33,6 @@
<processor state="root" enableJmx="true">
<mailet match="All" class="PostmasterAlias"/>
<mailet match="RelayLimit=30" class="Null"/>
- <!-- Hook on sievemanager@james.linagora.com
- Mail send to this address will get interpreted with SIEVE Manage -->
- <mailet match="RecipientIs=sievemanager@james.linagora.com" class="ToProcessor">
- <processor>sieve-manager-check</processor>
- </mailet>
- <mailet match="HasMailAttribute=spamChecked" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="All" class="SetMailAttribute">
- <spamChecked>true</spamChecked>
- </mailet>
- <mailet match="SMTPAuthSuccessful" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="InSpammerBlacklist=query.bondedsender.org." class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <!-- Check for delivery from a known spam server -->
- <!-- This set of matchers/mailets redirect all emails from known -->
- <!-- black holes, open relays, and spam servers to the spam processor -->
- <!-- For this set to function properly, the spam processor must be configured. -->
- <mailet match="InSpammerBlacklist=dnsbl.njabl.org." class="ToProcessor">
- <processor>spam</processor>
- <notice>550 Requested action not taken: rejected - see http://njabl.org/</notice>
- </mailet>
<mailet match="All" class="ToProcessor">
<processor>transport</processor>
</mailet>
@@ -107,12 +82,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="true">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="true">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml b/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml
index 8ad6c2c..d3a81be 100644
--- a/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml
+++ b/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml
@@ -33,31 +33,6 @@
<processor state="root" enableJmx="true">
<mailet match="All" class="PostmasterAlias"/>
<mailet match="RelayLimit=30" class="Null"/>
- <!-- Hook on sievemanager@james.linagora.com
- Mail send to this address will get interpreted with SIEVE Manage -->
- <mailet match="RecipientIs=sievemanager@james.linagora.com" class="ToProcessor">
- <processor>sieve-manager-check</processor>
- </mailet>
- <mailet match="HasMailAttribute=spamChecked" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="All" class="SetMailAttribute">
- <spamChecked>true</spamChecked>
- </mailet>
- <mailet match="SMTPAuthSuccessful" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="InSpammerBlacklist=query.bondedsender.org." class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <!-- Check for delivery from a known spam server -->
- <!-- This set of matchers/mailets redirect all emails from known -->
- <!-- black holes, open relays, and spam servers to the spam processor -->
- <!-- For this set to function properly, the spam processor must be configured. -->
- <mailet match="InSpammerBlacklist=dnsbl.njabl.org." class="ToProcessor">
- <processor>spam</processor>
- <notice>550 Requested action not taken: rejected - see http://njabl.org/</notice>
- </mailet>
<mailet match="All" class="ToProcessor">
<processor>transport</processor>
</mailet>
@@ -107,12 +82,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="true">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="true">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
index efeca5d..ae32aa6 100644
--- a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
+++ b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
@@ -83,12 +83,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="true">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="true">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
index aae7b8b..6aef809 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
@@ -97,12 +97,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="false">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="false">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
index e1f7f43..5cdc6b5 100644
--- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
@@ -98,12 +98,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="false">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="false">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
index b706323..07c63d0 100644
--- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
@@ -121,7 +121,6 @@ public class WebAdminServerIntegrationTest {
.body("repository", containsInAnyOrder(
"var/mail/error/",
"var/mail/relay-denied/",
- "var/mail/spam/",
"var/mail/address-error/"));
}
@@ -137,7 +136,6 @@ public class WebAdminServerIntegrationTest {
.body("repository", containsInAnyOrder(
"var/mail/error/",
"var/mail/relay-denied/",
- "var/mail/spam/",
"var/mail/address-error/"));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml b/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml
index 15f351d..a16cf3c 100644
--- a/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml
+++ b/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml
@@ -84,12 +84,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="false">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="false">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org