This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit f61d6abd2937b0aaddf2ead84123262d4ca6080f
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Thu Jun 25 14:03:30 2020 +0700
JAMES-3253 Remove Log warning for remoteDelivery configuration in
defaultMailetContainer.xml for JPA Guice
This file is relied upon when configuration file is missing
---
.../guice/cassandra/package/etc/james/templates/mailetcontainer.xml | 2 +-
examples/custom-mailets/src/main/resources/mailetcontainer.xml | 2 +-
.../guice/jpa-guice/src/main/resources/defaultMailetContainer.xml | 2 +-
.../guice/jpa-smtp-common/src/main/resources/defaultMailetContainer.xml | 2 +-
.../guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml | 2 +-
.../protocols/jmap/src/main/resources/defaultJmapMailetContainer.xml | 2 +-
.../mailet/mailetcontainer-api/src/main/resources/mailetcontainer.xml | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/mailetcontainer.xml
b/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/mailetcontainer.xml
index e8200f4..dc78a59 100644
---
a/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/mailetcontainer.xml
+++
b/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/mailetcontainer.xml
@@ -87,7 +87,7 @@
<mailet match="All" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
- <maxRetries>25</maxRetries>
+ <maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
<deliveryThreads>10</deliveryThreads>
<sendpartial>true</sendpartial>
diff --git a/examples/custom-mailets/src/main/resources/mailetcontainer.xml
b/examples/custom-mailets/src/main/resources/mailetcontainer.xml
index 125b775..4817d3f 100644
--- a/examples/custom-mailets/src/main/resources/mailetcontainer.xml
+++ b/examples/custom-mailets/src/main/resources/mailetcontainer.xml
@@ -101,7 +101,7 @@
<mailet match="All" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
- <maxRetries>25</maxRetries>
+ <maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
<deliveryThreads>10</deliveryThreads>
<sendpartial>true</sendpartial>
diff --git
a/server/container/guice/jpa-guice/src/main/resources/defaultMailetContainer.xml
b/server/container/guice/jpa-guice/src/main/resources/defaultMailetContainer.xml
index 8a0e360..3822f0c 100644
---
a/server/container/guice/jpa-guice/src/main/resources/defaultMailetContainer.xml
+++
b/server/container/guice/jpa-guice/src/main/resources/defaultMailetContainer.xml
@@ -49,7 +49,7 @@
<mailet match="SMTPAuthSuccessful" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
- <maxRetries>25</maxRetries>
+ <maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
<deliveryThreads>10</deliveryThreads>
<sendpartial>true</sendpartial>
diff --git
a/server/container/guice/jpa-smtp-common/src/main/resources/defaultMailetContainer.xml
b/server/container/guice/jpa-smtp-common/src/main/resources/defaultMailetContainer.xml
index 8ce1d59..4b07dc0 100644
---
a/server/container/guice/jpa-smtp-common/src/main/resources/defaultMailetContainer.xml
+++
b/server/container/guice/jpa-smtp-common/src/main/resources/defaultMailetContainer.xml
@@ -43,7 +43,7 @@
<mailet match="SMTPAuthSuccessful" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
- <maxRetries>25</maxRetries>
+ <maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
<deliveryThreads>10</deliveryThreads>
<sendpartial>true</sendpartial>
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 de035fb..38d009d 100644
---
a/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml
+++
b/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml
@@ -63,7 +63,7 @@
<mailet match="relay-allowed" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
- <maxRetries>25</maxRetries>
+ <maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
<deliveryThreads>10</deliveryThreads>
<sendpartial>true</sendpartial>
diff --git
a/server/container/guice/protocols/jmap/src/main/resources/defaultJmapMailetContainer.xml
b/server/container/guice/protocols/jmap/src/main/resources/defaultJmapMailetContainer.xml
index 713316e..2a625c5 100644
---
a/server/container/guice/protocols/jmap/src/main/resources/defaultJmapMailetContainer.xml
+++
b/server/container/guice/protocols/jmap/src/main/resources/defaultJmapMailetContainer.xml
@@ -65,7 +65,7 @@
<mailet match="All" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 23*500000</delayTime>
- <maxRetries>25</maxRetries>
+ <maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
<deliveryThreads>10</deliveryThreads>
<sendpartial>true</sendpartial>
diff --git
a/server/mailet/mailetcontainer-api/src/main/resources/mailetcontainer.xml
b/server/mailet/mailetcontainer-api/src/main/resources/mailetcontainer.xml
index 465214a..09022b6 100644
--- a/server/mailet/mailetcontainer-api/src/main/resources/mailetcontainer.xml
+++ b/server/mailet/mailetcontainer-api/src/main/resources/mailetcontainer.xml
@@ -63,7 +63,7 @@
<delayTime>2 hours</delayTime>
<delayTime>3 hours</delayTime>
<delayTime>6 hours</delayTime>
- <maxRetries>25</maxRetries>
+ <maxRetries>6</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
<deliveryThreads>10</deliveryThreads>
<sendpartial>true</sendpartial>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
