qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgodf...@apache.org
Subject svn commit: r1726249 - in /qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb: EnvironmentFacade.java EnvironmentUtils.java StandardEnvironmentFacade.java replication/ReplicatedEnvironmentFacade.java
Date Fri, 22 Jan 2016 16:10:04 GMT
Author: rgodfrey
Date: Fri Jan 22 16:10:03 2016
New Revision: 1726249

URL: http://svn.apache.org/viewvc?rev=1726249&view=rev
Log:
QPID-7006 , QPID-7007 : Update based on [~kwall]s review comments

Modified:
    qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java
    qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentUtils.java
    qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
    qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java?rev=1726249&r1=1726248&r2=1726249&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java
(original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java
Fri Jan 22 16:10:03 2016
@@ -44,6 +44,8 @@ public interface EnvironmentFacade
         put(EnvironmentConfig.LOCK_N_LOCK_TABLES, "7");
         // Turn off stats generation - feature introduced (and on by default) from BDB JE
5.0.84
         put(EnvironmentConfig.STATS_COLLECT, "false");
+        put(EnvironmentConfig.FILE_LOGGING_LEVEL, "OFF");
+        put(EnvironmentConfig.CONSOLE_LOGGING_LEVEL, "OFF");
         put(EnvironmentConfig.CLEANER_UPGRADE_TO_LOG_VERSION, "-1");
         // Automatic cleaner adjustment has been seen to stop the cleaner working at all,
disable it
         // Newer versions of BDB JE 6.3 ignore this setting.

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentUtils.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentUtils.java?rev=1726249&r1=1726248&r2=1726249&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentUtils.java
(original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentUtils.java
Fri Jan 22 16:10:03 2016
@@ -192,18 +192,18 @@ final public class EnvironmentUtils
                         if(!currentlySetInEnv || !contextValue.equals(mutableConfig.getConfigParam(paramName)))
                         {
                             mutableConfig.setConfigParam(paramName, contextValue);
-                            LOGGER.debug("Setting BDB configuration parameter '%1' to value
'%2'.", param, contextValue);
+                            LOGGER.debug("Setting BDB configuration parameter '{}' to value
'{}'.", param, contextValue);
                         }
                     }
                     else if(currentlySetInEnv && !paramsSetByDefault.contains(paramName))
                     {
                         mutableConfig.setConfigParam(paramName, param.getDefault());
-                        LOGGER.debug("Setting BDB configuration parameter '%1' to its default
value.", param);
+                        LOGGER.debug("Setting BDB configuration parameter '{}' to its default
value.", param);
                     }
                 }
                 catch (IllegalArgumentException e)
                 {
-                    LOGGER.warn("Unable to set BDB configuration parameter '%1' to value
'%2'.", param, contextValue, e);
+                    LOGGER.warn("Unable to set BDB configuration parameter '{}' to value
'{}'.", param, contextValue, e);
                 }
 
             }

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java?rev=1726249&r1=1726248&r2=1726249&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
(original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
Fri Jan 22 16:10:03 2016
@@ -72,9 +72,7 @@ public class StandardEnvironmentFacade i
     static
     {
         Set<String> excludes = new HashSet<>(ENVCONFIG_DEFAULTS.keySet());
-        excludes.addAll(Arrays.asList(EnvironmentConfig.FILE_LOGGING_LEVEL,
-                                      EnvironmentConfig.CONSOLE_LOGGING_LEVEL,
-                                      EnvironmentConfig.MAX_MEMORY,
+        excludes.addAll(Arrays.asList(EnvironmentConfig.MAX_MEMORY,
                                       EnvironmentConfig.MAX_MEMORY_PERCENT
                                       ));
         PARAMS_SET_BY_DEFAULT = Collections.unmodifiableSet(excludes);
@@ -105,8 +103,6 @@ public class StandardEnvironmentFacade i
         envConfig.setAllowCreate(true);
         envConfig.setTransactional(true);
         envConfig.setCacheMode(CacheMode.EVICT_LN);
-        envConfig.setConfigParam(EnvironmentConfig.FILE_LOGGING_LEVEL, "OFF");
-        envConfig.setConfigParam(EnvironmentConfig.CONSOLE_LOGGING_LEVEL, "OFF");
         envConfig.setLoggingHandler(new Slf4jLoggingHandler("["+configuration.getName()+"]"));
 
         Map<String, String> params = new HashMap<>(EnvironmentFacade.ENVCONFIG_DEFAULTS);

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java?rev=1726249&r1=1726248&r2=1726249&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
(original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
Fri Jan 22 16:10:03 2016
@@ -176,9 +176,7 @@ public class ReplicatedEnvironmentFacade
 
         excludes.addAll(REPCONFIG_DEFAULTS.keySet());
 
-        excludes.addAll(Arrays.asList(EnvironmentConfig.FILE_LOGGING_LEVEL,
-                                      EnvironmentConfig.CONSOLE_LOGGING_LEVEL,
-                                      EnvironmentConfig.MAX_MEMORY,
+        excludes.addAll(Arrays.asList(EnvironmentConfig.MAX_MEMORY,
                                       EnvironmentConfig.MAX_MEMORY_PERCENT
                                      ));
         PARAMS_SET_BY_DEFAULT = Collections.unmodifiableSet(excludes);
@@ -1525,8 +1523,6 @@ public class ReplicatedEnvironmentFacade
         envConfig.setExceptionListener(new ExceptionListener());
         envConfig.setDurability(_defaultDurability);
         envConfig.setCacheMode(CacheMode.EVICT_LN);
-        envConfig.setConfigParam(EnvironmentConfig.FILE_LOGGING_LEVEL, "OFF");
-        envConfig.setConfigParam(EnvironmentConfig.CONSOLE_LOGGING_LEVEL, "OFF");
         envConfig.setLoggingHandler(new Slf4jLoggingHandler("[" + _configuration.getName()
+ "]"));
 
         for (Map.Entry<String, String> configItem : environmentParameters.entrySet())



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message