You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2023/10/20 08:35:43 UTC
[james-project] 05/08: JAMES-3926 Fix quota.compatibility.mode configuration
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit bc4dfc46fc2b786f47dbd1d62da6d28d1a294992
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Tue Oct 17 15:28:28 2023 +0700
JAMES-3926 Fix quota.compatibility.mode configuration
Need the PropertiesProvider to read cassandra.properties file, not the FileConfigurationProvider
---
.../java/org/apache/james/CassandraJamesServerConfiguration.java | 6 ++++--
.../java/org/apache/james/CassandraRabbitMQJamesConfiguration.java | 6 ++++--
.../java/org/apache/james/DistributedPOP3JamesConfiguration.java | 7 +++++--
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/server/apps/cassandra-app/src/main/java/org/apache/james/CassandraJamesServerConfiguration.java b/server/apps/cassandra-app/src/main/java/org/apache/james/CassandraJamesServerConfiguration.java
index ee8d86a699..9731958a7e 100644
--- a/server/apps/cassandra-app/src/main/java/org/apache/james/CassandraJamesServerConfiguration.java
+++ b/server/apps/cassandra-app/src/main/java/org/apache/james/CassandraJamesServerConfiguration.java
@@ -151,9 +151,11 @@ public class CassandraJamesServerConfiguration implements Configuration {
boolean quotaCompatibilityMode = this.quotaCompatibilityMode.orElseGet(() -> {
try {
- return configurationProvider.getConfiguration("cassandra").getBoolean("quota.compatibility.mode", false);
- } catch (ConfigurationException e) {
+ return propertiesProvider.getConfiguration("cassandra").getBoolean("quota.compatibility.mode", false);
+ } catch (FileNotFoundException e) {
return false;
+ } catch (ConfigurationException e) {
+ throw new RuntimeException(e);
}
});
diff --git a/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesConfiguration.java b/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesConfiguration.java
index ac7ae1da56..5d55feb301 100644
--- a/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesConfiguration.java
+++ b/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesConfiguration.java
@@ -180,9 +180,11 @@ public class CassandraRabbitMQJamesConfiguration implements Configuration {
boolean quotaCompatibilityMode = this.quotaCompatibilityMode.orElseGet(() -> {
try {
- return configurationProvider.getConfiguration("cassandra").getBoolean("quota.compatibility.mode", false);
- } catch (ConfigurationException e) {
+ return propertiesProvider.getConfiguration("cassandra").getBoolean("quota.compatibility.mode", false);
+ } catch (FileNotFoundException e) {
return false;
+ } catch (ConfigurationException e) {
+ throw new RuntimeException(e);
}
});
diff --git a/server/apps/distributed-pop3-app/src/main/java/org/apache/james/DistributedPOP3JamesConfiguration.java b/server/apps/distributed-pop3-app/src/main/java/org/apache/james/DistributedPOP3JamesConfiguration.java
index 6264d1bd61..11a0cf748a 100644
--- a/server/apps/distributed-pop3-app/src/main/java/org/apache/james/DistributedPOP3JamesConfiguration.java
+++ b/server/apps/distributed-pop3-app/src/main/java/org/apache/james/DistributedPOP3JamesConfiguration.java
@@ -20,6 +20,7 @@
package org.apache.james;
import java.io.File;
+import java.io.FileNotFoundException;
import java.util.Optional;
import org.apache.commons.configuration2.ex.ConfigurationException;
@@ -148,9 +149,11 @@ public class DistributedPOP3JamesConfiguration implements Configuration {
boolean quotaCompatibilityMode = this.quotaCompatibilityMode.orElseGet(() -> {
try {
- return configurationProvider.getConfiguration("cassandra").getBoolean("quota.compatibility.mode", false);
- } catch (ConfigurationException e) {
+ return propertiesProvider.getConfiguration("cassandra").getBoolean("quota.compatibility.mode", false);
+ } catch (FileNotFoundException e) {
return false;
+ } catch (ConfigurationException e) {
+ throw new RuntimeException(e);
}
});
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org