Author: rgodfrey
Date: Sun Jul 5 17:46:21 2015
New Revision: 1689268
URL: http://svn.apache.org/r1689268
Log:
QPID-6620 : [Java Broker] restore isDebugEnabled functionality but use it more
sparingly
Added:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/EffectiveLevelFilter.java
(with props)
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/QpidLoggerTurboFilter.java
(with props)
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/QpidLoggerTurboFilterTest.java
(with props)
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/Broker.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractLogger.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractNameAndLevelFilter.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilter.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java
qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporter.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
(original)
+++
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
Sun Jul 5 17:46:21 2015
@@ -182,11 +182,7 @@ public abstract class AbstractBDBMessage
*/
StorableMessageMetaData getMessageMetaData(long messageId) throws
StoreException
{
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("public MessageMetaData getMessageMetaData(Long
messageId = "
- + messageId + "): called");
- }
+ getLogger().debug("public MessageMetaData getMessageMetaData(Long
messageId = {}): called", messageId);
DatabaseEntry key = new DatabaseEntry();
LongBinding.longToEntry(messageId, key);
@@ -234,36 +230,23 @@ public abstract class AbstractBDBMessage
DatabaseEntry key = new DatabaseEntry();
LongBinding.longToEntry(messageId, key);
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("Removing message id " + messageId);
- }
+ getLogger().debug("Removing message id {}", messageId);
OperationStatus status = getMessageMetaDataDb().delete(tx,
key);
if (status == OperationStatus.NOTFOUND)
{
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("Message id " + messageId
- + " not found (attempt to remove failed -
probably application initiated rollback)");
- }
+ getLogger().debug("Message id {} not found (attempt to
remove failed - probably application initiated rollback)",messageId);
}
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("Deleted metadata for message " +
messageId);
- }
+ getLogger().debug("Deleted metadata for message {}",
messageId);
//now remove the content data from the store if there is
any.
DatabaseEntry contentKeyEntry = new DatabaseEntry();
LongBinding.longToEntry(messageId, contentKeyEntry);
getMessageContentDb().delete(tx, contentKeyEntry);
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("Deleted content for message " +
messageId);
- }
+ getLogger().debug("Deleted content for message {}",
messageId);
getEnvironmentFacade().commit(tx, sync);
@@ -281,9 +264,7 @@ public abstract class AbstractBDBMessage
}
catch(RuntimeException e2)
{
- getLogger().warn(
- "Unable to abort transaction after
LockConflictException on removal of message with id "
- + messageId,
+ getLogger().warn("Unable to abort transaction after
LockConflictException on removal of message with id {}", messageId,
e2);
// rethrow the original log conflict exception, the
secondary exception should already have
// been logged.
@@ -292,8 +273,7 @@ public abstract class AbstractBDBMessage
}
- getLogger().warn("Lock timeout exception. Retrying
(attempt "
- + (attempts + 1) + " of " +
LOCK_RETRY_ATTEMPTS + ") " + e);
+ getLogger().warn("Lock timeout exception. Retrying
(attempt {} of {} ", new Object[] {(attempts + 1), LOCK_RETRY_ATTEMPTS, e});
if(++attempts < LOCK_RETRY_ATTEMPTS)
{
@@ -374,10 +354,8 @@ public abstract class AbstractBDBMessage
ContentBinding contentTupleBinding = ContentBinding.getInstance();
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("Message Id: " + messageId + " Getting content
body from offset: " + offset);
- }
+ getLogger().debug("Message Id: {} Getting content body from offset:
{}", messageId, offset);
+
try
{
@@ -422,10 +400,7 @@ public abstract class AbstractBDBMessage
ContentBinding contentTupleBinding = ContentBinding.getInstance();
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("Message Id: " + messageId + " Getting content
body");
- }
+ getLogger().debug("Message Id: {} Getting content body", messageId);
try
{
@@ -546,11 +521,8 @@ public abstract class AbstractBDBMessage
throw new StoreException("Error adding content for message id
" + messageId + ": " + status);
}
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("Storing content for message " + messageId +
" in transaction " + tx);
+ getLogger().debug("Storing content for message {} in transaction
{}", messageId, tx);
- }
}
catch (RuntimeException e)
{
@@ -574,12 +546,8 @@ public abstract class AbstractBDBMessage
StorableMessageMetaData messageMetaData)
throws StoreException
{
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("storeMetaData called for transaction " + tx
- + ", messageId " + messageId
- + ", messageMetaData " + messageMetaData);
- }
+ getLogger().debug("storeMetaData called for transaction {}, messageId
{}, messageMetaData {} ",
+ new Object[] {tx, messageId, messageMetaData});
DatabaseEntry key = new DatabaseEntry();
LongBinding.longToEntry(messageId, key);
@@ -590,10 +558,8 @@ public abstract class AbstractBDBMessage
try
{
getMessageMetaDataDb().put(tx, key, value);
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("Storing message metadata for message id " +
messageId + " in transaction " + tx);
- }
+ getLogger().debug("Storing message metadata for message id {} in
transaction {}", messageId, tx);
+
}
catch (RuntimeException e)
{
@@ -629,14 +595,14 @@ public abstract class AbstractBDBMessage
{
if (getLogger().isDebugEnabled())
{
- getLogger().debug("Enqueuing message " + messageId + " on
queue "
- + queue.getName() + " with id " +
queue.getId() + " in transaction " + tx);
+ getLogger().debug("Enqueuing message {} on queue {} with id {}
in transaction {}",
+ new Object[]{messageId, queue.getName(),
queue.getId(), tx});
}
getDeliveryDb().put(tx, key, value);
}
catch (RuntimeException e)
{
- getLogger().error("Failed to enqueue: " + e.getMessage(), e);
+ getLogger().error("Failed to enqueue: {}", e.getMessage(), e);
throw getEnvironmentFacade().handleDatabaseException("Error
writing enqueued message with id "
+ messageId
+ " for queue
"
@@ -665,10 +631,8 @@ public abstract class AbstractBDBMessage
QueueEntryKey queueEntryKey = new QueueEntryKey(queueId, messageId);
UUID id = queueId;
keyBinding.objectToEntry(queueEntryKey, key);
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("Dequeue message id " + messageId + " from queue
with id " + id);
- }
+
+ getLogger().debug("Dequeue message id {} from queue with id {}",
messageId, id);
try
{
@@ -683,11 +647,8 @@ public abstract class AbstractBDBMessage
throw new StoreException("Unable to remove message with id " +
messageId + " on queue with id " + id);
}
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("Removed message " + messageId + " on queue
with id " + id);
+ getLogger().debug("Removed message {} on queue with id {}",
messageId, id);
- }
}
catch (RuntimeException e)
{
@@ -787,11 +748,8 @@ public abstract class AbstractBDBMessage
FutureResult result = getEnvironmentFacade().commit(tx, syncCommit);
- if (getLogger().isDebugEnabled())
- {
- String transactionType = syncCommit ? "synchronous" :
"asynchronous";
- getLogger().debug("commitTranImpl completed " + transactionType +
" transaction " + tx);
- }
+ getLogger().debug("commitTranImpl completed {} transaction {}",
+ syncCommit ? "synchronous" : "asynchronous", tx);
return result;
}
@@ -805,10 +763,7 @@ public abstract class AbstractBDBMessage
*/
private void abortTran(final Transaction tx) throws StoreException
{
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("abortTran called for transaction " + tx);
- }
+ getLogger().debug("abortTran called for transaction {}", tx);
try
{
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/Broker.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/Broker.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/Broker.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/Broker.java
Sun Jul 5 17:46:21 2015
@@ -285,10 +285,8 @@ public class Broker
//ignore, means the JVM is already shutting down
}
- if(LOGGER.isDebugEnabled())
- {
- LOGGER.debug("Removed shutdown hook: " + removed);
- }
+ LOGGER.debug("Removed shutdown hook: {}", removed);
+
}
else
{
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
Sun Jul 5 17:46:21 2015
@@ -143,10 +143,7 @@ public class ManagementModeStoreHandler
}
if (quiesce)
{
- if (LOGGER.isDebugEnabled())
- {
- LOGGER.debug("Management mode quiescing entry " +
object);
- }
+ LOGGER.debug("Management mode quiescing entry {}", object);
// save original state
_quiescedEntriesOriginalState.put(object.getId(),
attributes.get(ATTRIBUTE_STATE));
@@ -429,10 +426,7 @@ public class ManagementModeStoreHandler
}
if (quiesce)
{
- if (LOGGER.isDebugEnabled())
- {
- LOGGER.debug("Management mode quiescing entry " +
entry);
- }
+ LOGGER.debug("Management mode quiescing entry {}", entry);
// save original state
quiescedEntries.put(entry.getId(),
attributes.get(ATTRIBUTE_STATE));
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java
Sun Jul 5 17:46:21 2015
@@ -139,10 +139,7 @@ public class TaskExecutorImpl implements
public <T> Future<T> submit(Task<T> task)
{
checkState();
- if (LOGGER.isDebugEnabled())
- {
- LOGGER.debug("Submitting task: " + task);
- }
+ LOGGER.debug("Submitting task: {}", task);
Future<T> future = null;
if (isTaskExecutorThread())
{
@@ -316,15 +313,9 @@ public class TaskExecutorImpl implements
private <T> T executeTask(Task<T> userTask)
{
- if (LOGGER.isDebugEnabled())
- {
- LOGGER.debug("Performing task " + userTask);
- }
+ LOGGER.debug("Performing task {}", userTask);
T result = userTask.execute();
- if (LOGGER.isDebugEnabled())
- {
- LOGGER.debug("Task " + userTask + " is performed successfully with
result:" + result);
- }
+ LOGGER.debug("Task {} is performed successfully with result: {}",
userTask, result);
return result;
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
Sun Jul 5 17:46:21 2015
@@ -456,10 +456,8 @@ public abstract class AbstractExchange<T
deletedQueues = true;
queues = new ArrayList<BaseQueue>(allQueues);
}
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Exchange: " + getName() + " - attempt to
enqueue message onto deleted queue " + q.getName());
- }
+ _logger.debug("Exchange: {} - attempt to enqueue message onto
deleted queue {}", getName(), q.getName());
+
queues.remove(q);
}
}
@@ -679,10 +677,7 @@ public abstract class AbstractExchange<T
if ((getLifetimePolicy() == LifetimePolicy.DELETE_ON_NO_OUTBOUND_LINKS
|| getLifetimePolicy() == LifetimePolicy.DELETE_ON_NO_LINKS )
&& getBindingCount() == 0)
{
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Auto-deleting exchange:" + this);
- }
+ _logger.debug("Auto-deleting exchange: {}", this);
if(getTaskExecutor().isTaskExecutorThread())
{
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
Sun Jul 5 17:46:21 2015
@@ -107,10 +107,7 @@ public class FanoutExchange extends Abst
}
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Publishing message to queue " + result);
- }
+ _logger.debug("Publishing message to queue {}", result);
return result;
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
Sun Jul 5 17:46:21 2015
@@ -93,10 +93,7 @@ public class HeadersExchange extends Abs
final String routingKey,
final InstanceProperties
instanceProperties)
{
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Exchange " + getName() + ": routing message with
headers " + payload.getMessageHeader());
- }
+ _logger.debug("Exchange {}: routing message with headers {}",
getName(), payload.getMessageHeader());
LinkedHashSet<BaseQueue> queues = new LinkedHashSet<BaseQueue>();
@@ -177,10 +174,8 @@ public class HeadersExchange extends Abs
}
boolean removedBinding = _bindingHeaderMatchers.remove(new
HeadersBinding(binding));
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Removing Binding: " + removedBinding);
- }
+ _logger.debug("Removing Binding: {}", removedBinding);
+
}
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
Sun Jul 5 17:46:21 2015
@@ -77,10 +77,8 @@ public class TopicExchange extends Abstr
assert queue != null;
assert bindingKey != null;
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Updating binding of queue " + queue.getName() + "
with routing key " + bindingKey);
- }
+ _logger.debug("Updating binding of queue {} with routing key {}",
queue.getName(), bindingKey);
+
String routingKey = TopicNormalizer.normalize(bindingKey);
@@ -140,10 +138,8 @@ public class TopicExchange extends Abstr
assert queue != null;
assert bindingKey != null;
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Registering queue " + queue.getName() + " with
routing key " + bindingKey);
- }
+ _logger.debug("Registering queue {} with routing key {}",
queue.getName(), bindingKey);
+
String routingKey = TopicNormalizer.normalize(bindingKey);
@@ -259,10 +255,7 @@ public class TopicExchange extends Abstr
{
Map<String,Object> bindingArgs = _bindings.remove(binding);
- if (_logger.isDebugEnabled())
- {
- _logger.debug("deregisterQueue " + bindingArgs);
- }
+ _logger.debug("deregisterQueue {}", bindingArgs);
String bindingKey =
TopicNormalizer.normalize(binding.getBindingKey());
TopicExchangeResult result = _topicExchangeResults.get(bindingKey);
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractLogger.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractLogger.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractLogger.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractLogger.java
Sun Jul 5 17:46:21 2015
@@ -57,7 +57,7 @@ public abstract class AbstractLogger<X e
super.postResolveChildren();
LoggerContext loggerContext = ROOT_LOGGER.getLoggerContext();
-
+ QpidLoggerTurboFilter.installIfNecessary(loggerContext);
Appender<ILoggingEvent> appender =
createAppenderInstance(loggerContext);
appender.setName(getName());
appender.setContext(loggerContext);
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractNameAndLevelFilter.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractNameAndLevelFilter.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractNameAndLevelFilter.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractNameAndLevelFilter.java
Sun Jul 5 17:46:21 2015
@@ -71,6 +71,7 @@ public abstract class AbstractNameAndLev
public void run()
{
deleted();
+ QpidLoggerTurboFilter.filterRemovedFromRootContext(_filter);
setState(State.DELETED);
returnVal.set(null);
@@ -83,6 +84,7 @@ public abstract class AbstractNameAndLev
private ListenableFuture<Void> doActivate()
{
setState(State.ACTIVE);
+ QpidLoggerTurboFilter.filterAddedToRootContext(_filter);
return Futures.immediateFuture(null);
}
}
Added:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/EffectiveLevelFilter.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/EffectiveLevelFilter.java?rev=1689268&view=auto
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/EffectiveLevelFilter.java
(added)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/EffectiveLevelFilter.java
Sun Jul 5 17:46:21 2015
@@ -0,0 +1,29 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.logging;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+
+public interface EffectiveLevelFilter
+{
+ Level getEffectiveLevel(Logger logger);
+}
Propchange:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/EffectiveLevelFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilter.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilter.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilter.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilter.java
Sun Jul 5 17:46:21 2015
@@ -26,7 +26,7 @@ import ch.qos.logback.classic.spi.ILoggi
import ch.qos.logback.core.filter.Filter;
import ch.qos.logback.core.spi.FilterReply;
-public class LoggerNameAndLevelFilter extends Filter<ILoggingEvent>
+public class LoggerNameAndLevelFilter extends Filter<ILoggingEvent> implements
EffectiveLevelFilter
{
private final Filter<ILoggingEvent> _filter;
private final String _loggerName;
@@ -97,4 +97,18 @@ public class LoggerNameAndLevelFilter ex
};
}
}
+
+ public Level getEffectiveLevel(final Logger logger)
+ {
+ if((_loggerName == null || "".equals(_loggerName) ||
Logger.ROOT_LOGGER_NAME.equals(_loggerName))
+ || (_loggerName.endsWith(".*") &&
logger.getName().startsWith(_loggerName.substring(0,_loggerName.length()-2)))
+ || _loggerName.equals(logger.getName()))
+ {
+ return _level;
+ }
+ else
+ {
+ return Level.OFF;
+ }
+ }
}
Added:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/QpidLoggerTurboFilter.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/QpidLoggerTurboFilter.java?rev=1689268&view=auto
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/QpidLoggerTurboFilter.java
(added)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/QpidLoggerTurboFilter.java
Sun Jul 5 17:46:21 2015
@@ -0,0 +1,162 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.logging;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicReference;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.turbo.TurboFilter;
+import ch.qos.logback.core.spi.FilterReply;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Marker;
+
+public final class QpidLoggerTurboFilter extends TurboFilter
+{
+ private final CopyOnWriteArrayList<EffectiveLevelFilter> _filters = new
CopyOnWriteArrayList<>();
+ private final AtomicReference<ConcurrentMap<Logger, Level>>
_effectiveLevels =
+ new AtomicReference<>();
+
+ public QpidLoggerTurboFilter()
+ {
+ clearCachedResults();
+ }
+
+
+
+ @Override
+ public FilterReply decide(final Marker marker,
+ final Logger logger,
+ final Level level,
+ final String format,
+ final Object[] params,
+ final Throwable t)
+ {
+ final ConcurrentMap<Logger, Level> effectiveLevels =
_effectiveLevels.get();
+ Level effectiveLoggerLevel = effectiveLevels.get(logger);
+
+ if(effectiveLoggerLevel == null)
+ {
+ effectiveLoggerLevel = Level.OFF;
+ for(EffectiveLevelFilter filter : _filters)
+ {
+ Level loggerLevel = filter.getEffectiveLevel(logger);
+ if(effectiveLoggerLevel.isGreaterOrEqual(loggerLevel))
+ {
+ effectiveLoggerLevel = loggerLevel;
+ }
+ }
+ effectiveLevels.putIfAbsent(logger, effectiveLoggerLevel);
+ }
+
+
+ return level.isGreaterOrEqual(effectiveLoggerLevel) ?
FilterReply.ACCEPT : FilterReply.DENY;
+ }
+
+ public void filterAdded(EffectiveLevelFilter filter)
+ {
+ if(_filters.addIfAbsent(filter))
+ {
+ clearCachedResults();
+ }
+ }
+
+ private void clearCachedResults()
+ {
+ _effectiveLevels.set(new ConcurrentHashMap<Logger, Level>());
+ }
+
+ public void filterRemoved(EffectiveLevelFilter filter)
+ {
+ if(_filters.remove(filter))
+ {
+ clearCachedResults();
+ }
+ }
+
+ @Override
+ public boolean equals(final Object o)
+ {
+ return (o != null && getClass() == o.getClass());
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return 0;
+ }
+
+ public static QpidLoggerTurboFilter installIfNecessary(LoggerContext
loggerContext)
+ {
+ QpidLoggerTurboFilter filter = new QpidLoggerTurboFilter();
+ if(!loggerContext.getTurboFilterList().addIfAbsent(filter))
+ {
+ for(TurboFilter candidate : loggerContext.getTurboFilterList())
+ {
+ if(candidate instanceof QpidLoggerTurboFilter)
+ {
+ filter = (QpidLoggerTurboFilter)candidate;
+ break;
+ }
+ }
+ }
+ return filter;
+ }
+
+
+ public static QpidLoggerTurboFilter installIfNecessaryToRootContext()
+ {
+ return installIfNecessary(getRootContext());
+ }
+
+ private static LoggerContext getRootContext()
+ {
+ final Logger rootLogger = (Logger)
(LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME));
+ return rootLogger.getLoggerContext();
+ }
+
+ public static void filterAdded(EffectiveLevelFilter filter, LoggerContext
context)
+ {
+ QpidLoggerTurboFilter turboFilter = installIfNecessary(context);
+ turboFilter.filterAdded(filter);
+ }
+
+ public static void filterRemoved(EffectiveLevelFilter filter,
LoggerContext context)
+ {
+ QpidLoggerTurboFilter turboFilter = installIfNecessary(context);
+ turboFilter.filterRemoved(filter);
+ }
+
+ public static void filterAddedToRootContext(EffectiveLevelFilter filter)
+ {
+ filterAdded(filter, getRootContext());
+ }
+
+ public static void filterRemovedFromRootContext(EffectiveLevelFilter
filter)
+ {
+ filterRemoved(filter, getRootContext());
+ }
+
+}
Propchange:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/QpidLoggerTurboFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
Sun Jul 5 17:46:21 2015
@@ -24,7 +24,6 @@ import java.util.Collection;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.EventLoggerProvider;
-import org.apache.qpid.server.logging.LogRecorder;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.stats.StatisticsGatherer;
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
Sun Jul 5 17:46:21 2015
@@ -34,7 +34,6 @@ import java.util.regex.Pattern;
import javax.security.auth.Subject;
-import ch.qos.logback.core.Appender;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
@@ -45,10 +44,8 @@ import org.slf4j.LoggerFactory;
import org.apache.qpid.common.QpidProperties;
import org.apache.qpid.server.BrokerOptions;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.logging.BrokerMemoryLogger;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogRecorder;
-import org.apache.qpid.server.logging.RecordEventAppender;
import org.apache.qpid.server.logging.messages.BrokerMessages;
import org.apache.qpid.server.logging.messages.VirtualHostMessages;
import org.apache.qpid.server.model.*;
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
Sun Jul 5 17:46:21 2015
@@ -82,10 +82,7 @@ public class QpidServiceLoader
throw new ServerScopedRuntimeException("At least one
implementation of " + clazz + " expected");
}
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Found " + serviceImplementations.size() + "
implementations of " + clazz);
- }
+ _logger.debug("Found {} implementations of {}",
serviceImplementations.size(), clazz);
return serviceImplementations;
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Sun Jul 5 17:46:21 2015
@@ -2373,10 +2373,7 @@ public abstract class AbstractQueue<X ex
// therefore we should schedule this runner again (unless someone
beats us to it :-) ).
if (iterations == 0)
{
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Rescheduling runner:" + runner);
- }
+ _logger.debug("Rescheduling runner: {}", runner);
return 0L;
}
return rVal;
@@ -2412,10 +2409,7 @@ public abstract class AbstractQueue<X ex
if(acquiredForDequeueing)
{
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Dequeuing expired node " + node);
- }
+ _logger.debug("Dequeuing expired node {}", node);
// Then dequeue it.
dequeueEntry(node);
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java
Sun Jul 5 17:46:21 2015
@@ -83,10 +83,7 @@ public class AssignedConsumerMessageGrou
{
if(assignedSub == null)
{
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Assigning group " + groupVal + " to sub
" + sub);
- }
+ _logger.debug("Assigning group {} to sub {}", groupVal,
sub);
assignedSub = _groupMap.putIfAbsent(group, sub);
return assignedSub == null || assignedSub == sub;
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java
Sun Jul 5 17:46:21 2015
@@ -236,10 +236,7 @@ public class SimpleLDAPAuthenticationMan
if (server.isComplete())
{
String authorizationID = server.getAuthorizationID();
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Authenticated as " + authorizationID);
- }
+ _logger.debug("Authenticated as {}", authorizationID);
return new AuthenticationResult(new
UsernamePrincipal(authorizationID));
}
@@ -377,10 +374,7 @@ public class SimpleLDAPAuthenticationMan
}
Class<? extends AbstractLDAPSSLSocketFactory> clazz =
LDAPSSLSocketFactoryGenerator.createSubClass(clazzName,
sslContext.getSocketFactory());
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Connection to Directory will use custom SSL socket
factory : " + clazz);
- }
+ _logger.debug("Connection to Directory will use custom SSL socket
factory : {}", clazz);
return clazz;
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java
Sun Jul 5 17:46:21 2015
@@ -94,33 +94,25 @@ public class ExternalSaslServer implemen
String username;
String dn = ((X500Principal)
_externalPrincipal).getName(X500Principal.RFC2253);
- if(LOGGER.isDebugEnabled())
- {
- LOGGER.debug("Parsing username from Principal DN: " + dn);
- }
+ LOGGER.debug("Parsing username from Principal DN: {}", dn);
username = SSLUtil.getIdFromSubjectDN(dn);
if (username.isEmpty())
{
// CN is empty => Cannot construct username => Authentication
failed => return null
- if(LOGGER.isDebugEnabled())
- {
- LOGGER.debug("CN value was empty in Principal name, unable
to construct username");
- }
+ LOGGER.debug("CN value was empty in Principal name, unable to
construct username");
+
return null;
}
- if(LOGGER.isDebugEnabled())
- {
- LOGGER.debug("Constructing Principal with username: " +
username);
- }
+
+ LOGGER.debug("Constructing Principal with username: {}", username);
+
return new UsernamePrincipal(username);
}
else
{
- if(LOGGER.isDebugEnabled())
- {
- LOGGER.debug("Using external Principal: " +
_externalPrincipal);
- }
+ LOGGER.debug("Using external Principal: {}", _externalPrincipal);
+
return _externalPrincipal;
}
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java
Sun Jul 5 17:46:21 2015
@@ -205,10 +205,8 @@ public abstract class AbstractJDBCConfig
if(tableExists)
{
int configVersion = getConfigVersion(connection);
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("Upgrader read existing config version "
+ configVersion);
- }
+
+ getLogger().debug("Upgrader read existing config version {}",
configVersion);
switch(configVersion)
{
@@ -256,10 +254,8 @@ public abstract class AbstractJDBCConfig
if(tableExists)
{
int configVersion = getConfigVersion(connection);
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("Upgrader read existing config version "
+ configVersion);
- }
+
+ getLogger().debug("Upgrader read existing config version {}",
configVersion);
stringifiedConfigVersion = "0." + configVersion;
}
@@ -271,10 +267,7 @@ public abstract class AbstractJDBCConfig
ConfiguredObjectRecord virtualHostRecord = new
ConfiguredObjectRecordImpl(virtualHostId, "VirtualHost", virtualHostAttributes);
insertConfiguredObject(virtualHostRecord, connection);
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("Upgrader created VirtualHost configuration
entry with config version " + stringifiedConfigVersion);
- }
+ getLogger().debug("Upgrader created VirtualHost configuration
entry with config version {}", stringifiedConfigVersion);
Map<UUID,Map<String,Object>> bindingsToUpdate = new HashMap<UUID,
Map<String, Object>>();
List<UUID> others = new ArrayList<UUID>();
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
Sun Jul 5 17:46:21 2015
@@ -205,17 +205,14 @@ public abstract class AbstractJDBCMessag
private void upgradeIfNecessary(ConfiguredObject<?> parent) throws
SQLException
{
- Connection conn = newAutoCommitConnection();
- try
+ try (Connection conn = newAutoCommitConnection())
{
- PreparedStatement statement =
conn.prepareStatement(SELECT_FROM_DB_VERSION);
- try
+ try (PreparedStatement statement =
conn.prepareStatement(SELECT_FROM_DB_VERSION))
{
- ResultSet rs = statement.executeQuery();
- try
+ try (ResultSet rs = statement.executeQuery())
{
- if(!rs.next())
+ if (!rs.next())
{
throw new StoreException(DB_VERSION_TABLE_NAME + "
does not contain the database version");
}
@@ -232,20 +229,8 @@ public abstract class AbstractJDBCMessag
throw new StoreException("Unknown database
version: " + version);
}
}
- finally
- {
- rs.close();
- }
- }
- finally
- {
- statement.close();
}
}
- finally
- {
- conn.close();
- }
}
@@ -261,24 +246,13 @@ public abstract class AbstractJDBCMessag
private void updateDbVersion(int newVersion) throws SQLException
{
- Connection conn = newAutoCommitConnection();
- try
+ try (Connection conn = newAutoCommitConnection())
{
-
- PreparedStatement statement =
conn.prepareStatement(UPDATE_DB_VERSION);
- try
+ try (PreparedStatement statement =
conn.prepareStatement(UPDATE_DB_VERSION))
{
- statement.setInt(1,newVersion);
+ statement.setInt(1, newVersion);
statement.execute();
}
- finally
- {
- statement.close();
- }
- }
- finally
- {
- conn.close();
}
}
@@ -346,26 +320,16 @@ public abstract class AbstractJDBCMessag
{
if(!tableExists(DB_VERSION_TABLE_NAME, conn))
{
- Statement stmt = conn.createStatement();
- try
+ try (Statement stmt = conn.createStatement())
{
stmt.execute(CREATE_DB_VERSION_TABLE);
}
- finally
- {
- stmt.close();
- }
- PreparedStatement pstmt =
conn.prepareStatement(INSERT_INTO_DB_VERSION);
- try
+ try (PreparedStatement pstmt =
conn.prepareStatement(INSERT_INTO_DB_VERSION))
{
pstmt.setInt(1, DB_VERSION);
pstmt.execute();
}
- finally
- {
- pstmt.close();
- }
}
}
@@ -373,16 +337,11 @@ public abstract class AbstractJDBCMessag
{
if(!tableExists(QUEUE_ENTRY_TABLE_NAME, conn))
{
- Statement stmt = conn.createStatement();
- try
+ try (Statement stmt = conn.createStatement())
{
- stmt.execute("CREATE TABLE "+ QUEUE_ENTRY_TABLE_NAME +" (
queue_id varchar(36) not null, message_id "
+ stmt.execute("CREATE TABLE " + QUEUE_ENTRY_TABLE_NAME + " (
queue_id varchar(36) not null, message_id "
+ getSqlBigIntType() + " not null, PRIMARY KEY
(queue_id, message_id) )");
}
- finally
- {
- stmt.close();
- }
}
}
@@ -391,8 +350,7 @@ public abstract class AbstractJDBCMessag
{
if(!tableExists(META_DATA_TABLE_NAME, conn))
{
- Statement stmt = conn.createStatement();
- try
+ try (Statement stmt = conn.createStatement())
{
stmt.execute("CREATE TABLE "
+ META_DATA_TABLE_NAME
@@ -402,10 +360,6 @@ public abstract class AbstractJDBCMessag
+ getSqlBlobType()
+ ", PRIMARY KEY ( message_id ) )");
}
- finally
- {
- stmt.close();
- }
}
}
@@ -414,8 +368,7 @@ public abstract class AbstractJDBCMessag
{
if(!tableExists(MESSAGE_CONTENT_TABLE_NAME, conn))
{
- Statement stmt = conn.createStatement();
- try
+ try (Statement stmt = conn.createStatement())
{
stmt.execute("CREATE TABLE "
+ MESSAGE_CONTENT_TABLE_NAME
@@ -425,10 +378,6 @@ public abstract class AbstractJDBCMessag
+ getSqlBlobType()
+ ", PRIMARY KEY (message_id) )");
}
- finally
- {
- stmt.close();
- }
}
}
@@ -437,8 +386,7 @@ public abstract class AbstractJDBCMessag
{
if(!tableExists(XID_TABLE_NAME, conn))
{
- Statement stmt = conn.createStatement();
- try
+ try (Statement stmt = conn.createStatement())
{
stmt.execute("CREATE TABLE "
+ XID_TABLE_NAME
@@ -451,10 +399,6 @@ public abstract class AbstractJDBCMessag
+
"global_id, branch_id ))");
}
- finally
- {
- stmt.close();
- }
}
}
@@ -462,20 +406,28 @@ public abstract class AbstractJDBCMessag
{
if(!tableExists(XID_ACTIONS_TABLE_NAME, conn))
{
- Statement stmt = conn.createStatement();
- try
+ try (Statement stmt = conn.createStatement())
{
- stmt.execute("CREATE TABLE " + XID_ACTIONS_TABLE_NAME + " (
format " + getSqlBigIntType() + " not null,"
- + " global_id " + getSqlVarBinaryType(64) + " not
null, branch_id " + getSqlVarBinaryType(
- 64) + " not null, " +
- "action_type char not null, queue_id varchar(36)
not null, message_id " + getSqlBigIntType() + " not null" +
- ", PRIMARY KEY ( " +
+ stmt.execute("CREATE TABLE "
+ + XID_ACTIONS_TABLE_NAME
+ + " ( format "
+ + getSqlBigIntType()
+ + " not null,"
+ + " global_id "
+ + getSqlVarBinaryType(64)
+ + " not null, branch_id "
+ + getSqlVarBinaryType(
+ 64)
+ + " not null, "
+ +
+ "action_type char not null, queue_id varchar(36)
not null, message_id "
+ + getSqlBigIntType()
+ + " not null"
+ +
+ ", PRIMARY KEY ( "
+ +
"format, global_id, branch_id, action_type,
queue_id, message_id))");
}
- finally
- {
- stmt.close();
- }
}
}
@@ -515,17 +467,10 @@ public abstract class AbstractJDBCMessag
if (results == 0)
{
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("Message id " + messageId
- + " not found (attempt to remove
failed - probably application initiated rollback)");
- }
+ getLogger().debug("Message id {} not found (attempt to
remove failed - probably application initiated rollback)", messageId);
}
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("Deleted metadata for message " +
messageId);
- }
+ getLogger().debug("Deleted metadata for message {}",
messageId);
stmt = conn.prepareStatement(DELETE_FROM_MESSAGE_CONTENT);
stmt.setLong(1, messageId);
@@ -645,17 +590,12 @@ public abstract class AbstractJDBCMessag
+ "]");
}
- PreparedStatement stmt =
conn.prepareStatement(INSERT_INTO_QUEUE_ENTRY);
- try
+ try (PreparedStatement stmt =
conn.prepareStatement(INSERT_INTO_QUEUE_ENTRY))
{
stmt.setString(1, queue.getId().toString());
- stmt.setLong(2,messageId);
+ stmt.setLong(2, messageId);
stmt.executeUpdate();
}
- finally
- {
- stmt.close();
- }
}
catch (SQLException e)
@@ -675,29 +615,21 @@ public abstract class AbstractJDBCMessag
try
{
- PreparedStatement stmt =
conn.prepareStatement(DELETE_FROM_QUEUE_ENTRY);
- try
+ try (PreparedStatement stmt =
conn.prepareStatement(DELETE_FROM_QUEUE_ENTRY))
{
stmt.setString(1, queueId.toString());
stmt.setLong(2, messageId);
int results = stmt.executeUpdate();
-
- if(results != 1)
+ if (results != 1)
{
throw new StoreException("Unable to find message with id "
+ messageId
+ " on queue with id " + queueId);
}
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("Dequeuing message " + messageId + " on
queue with id " + queueId);
- }
- }
- finally
- {
- stmt.close();
+ getLogger().debug("Dequeuing message {} on queue with id {}",
messageId, queueId);
+
}
}
@@ -862,10 +794,7 @@ public abstract class AbstractJDBCMessag
Connection conn = connWrapper.getConnection();
conn.commit();
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("commit tran completed");
- }
+ getLogger().debug("commit tran completed");
conn.close();
}
@@ -983,10 +912,7 @@ public abstract class AbstractJDBCMessag
throw new StoreException("Fatal internal error: transactional
context is empty at abortTran");
}
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("abort tran called: " +
connWrapper.getConnection());
- }
+ getLogger().debug("abort tran called: {}",
connWrapper.getConnection());
try
{
@@ -1004,15 +930,12 @@ public abstract class AbstractJDBCMessag
private void storeMetaData(Connection conn, long messageId,
StorableMessageMetaData metaData)
throws SQLException
{
- if(getLogger().isDebugEnabled())
- {
- getLogger().debug("Adding metadata for message " + messageId);
- }
+ getLogger().debug("Adding metadata for message {}", messageId);
PreparedStatement stmt = conn.prepareStatement(INSERT_INTO_META_DATA);
try
{
- stmt.setLong(1,messageId);
+ stmt.setLong(1, messageId);
final int bodySize = 1 + metaData.getStorableSize();
byte[] underlying = new byte[bodySize];
@@ -1025,12 +948,12 @@ public abstract class AbstractJDBCMessag
ByteArrayInputStream bis = new ByteArrayInputStream(underlying);
try
{
- stmt.setBinaryStream(2,bis,underlying.length);
+ stmt.setBinaryStream(2, bis, underlying.length);
int result = stmt.executeUpdate();
- if(result == 0)
+ if (result == 0)
{
- throw new StoreException("Unable to add meta data for
message " +messageId);
+ throw new StoreException("Unable to add meta data for
message " + messageId);
}
}
finally
@@ -1174,10 +1097,8 @@ public abstract class AbstractJDBCMessag
private void addContent(Connection conn, long messageId, ByteBuffer src)
{
- if(getLogger().isDebugEnabled())
- {
- getLogger().debug("Adding content for message " + messageId);
- }
+ getLogger().debug("Adding content for message {}", messageId);
+
PreparedStatement stmt = null;
try
@@ -1789,10 +1710,7 @@ public abstract class AbstractJDBCMessag
@Override
public void remove()
{
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("REMOVE called on message: " + _messageId);
- }
+ getLogger().debug("REMOVE called on message: {}", _messageId);
checkMessageStoreOpen();
int delta = getMetaData().getContentSize();
@@ -1832,10 +1750,7 @@ public abstract class AbstractJDBCMessag
:
ByteBuffer.wrap(_messageDataRef.getData()));
- if(getLogger().isDebugEnabled())
- {
- getLogger().debug("Storing message " + _messageId + " to
store");
- }
+ getLogger().debug("Storing message {} to store", _messageId);
MessageDataRef<T> hardRef = _messageDataRef;
MessageDataSoftRef<T> messageDataSoftRef;
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
Sun Jul 5 17:46:21 2015
@@ -96,10 +96,7 @@ public class AsyncAutoCommitTransaction
FutureResult future;
if(record != null)
{
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Dequeue of message number " +
record.getMessageNumber() + " from transaction log. Queue : " +
record.getQueueId());
- }
+ _logger.debug("Dequeue of message number {} from transaction
log. Queue : {}", record.getMessageNumber(), record.getQueueId());
txn = _messageStore.newTransaction();
txn.dequeueMessage(record);
@@ -165,10 +162,7 @@ public class AsyncAutoCommitTransaction
if(record != null)
{
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Dequeue of message number " +
record.getMessageNumber() + " from transaction log. Queue : " +
record.getQueueId());
- }
+ _logger.debug("Dequeue of message number {} from
transaction log. Queue : {}", record.getMessageNumber(), record.getQueueId());
if(txn == null)
{
@@ -209,10 +203,7 @@ public class AsyncAutoCommitTransaction
final MessageEnqueueRecord enqueueRecord;
if(queue.getMessageDurability().persist(message.isPersistent()))
{
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Enqueue of message number " +
message.getMessageNumber() + " to transaction log. Queue : " + queue.getName());
- }
+ _logger.debug("Enqueue of message number {} to transaction
log. Queue : {}", message.getMessageNumber(), queue.getName());
txn = _messageStore.newTransaction();
enqueueRecord = txn.enqueueMessage(queue, message);
@@ -278,10 +269,8 @@ public class AsyncAutoCommitTransaction
{
if
(queue.getMessageDurability().persist(message.isPersistent()))
{
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Enqueue of message number " +
message.getMessageNumber() + " to transaction log. Queue : " + queue.getName());
- }
+ _logger.debug("Enqueue of message number {} to transaction
log. Queue : {}", message.getMessageNumber(), queue.getName());
+
if (txn == null)
{
txn = _messageStore.newTransaction();
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
Sun Jul 5 17:46:21 2015
@@ -80,10 +80,7 @@ public class AutoCommitTransaction imple
{
if(record != null)
{
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Dequeue of message number " +
record.getMessageNumber() + " from transaction log. Queue : " +
record.getQueueId());
- }
+ _logger.debug("Dequeue of message number {} from transaction
log. Queue : {}", record.getMessageNumber(), record.getQueueId());
txn = _messageStore.newTransaction();
txn.dequeueMessage(record);
@@ -111,10 +108,7 @@ public class AutoCommitTransaction imple
MessageEnqueueRecord enqueueRecord = entry.getEnqueueRecord();
if(enqueueRecord != null)
{
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Dequeue of message number " +
enqueueRecord.getMessageNumber() + " from transaction log. Queue : " +
enqueueRecord.getQueueId());
- }
+ _logger.debug("Dequeue of message number {} from
transaction log. Queue : {}", enqueueRecord.getMessageNumber(),
enqueueRecord.getQueueId());
if(txn == null)
{
@@ -149,10 +143,7 @@ public class AutoCommitTransaction imple
final MessageEnqueueRecord record;
if(queue.getMessageDurability().persist(message.isPersistent()))
{
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Enqueue of message number " +
message.getMessageNumber() + " to transaction log. Queue : " + queue.getName());
- }
+ _logger.debug("Enqueue of message number {} to transaction
log. Queue : {}", message.getMessageNumber(), queue.getName());
txn = _messageStore.newTransaction();
record = txn.enqueueMessage(queue, message);
@@ -205,10 +196,8 @@ public class AutoCommitTransaction imple
{
if
(queue.getMessageDurability().persist(message.isPersistent()))
{
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Enqueue of message number " +
message.getMessageNumber() + " to transaction log. Queue : " + queue.getName());
- }
+ _logger.debug("Enqueue of message number {} to transaction
log. Queue : {}", message.getMessageNumber(), queue.getName());
+
if (txn == null)
{
txn = _messageStore.newTransaction();
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
Sun Jul 5 17:46:21 2015
@@ -108,25 +108,15 @@ public class DtxBranch
public void setTimeout(long timeout)
{
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Setting timeout to " + timeout + "s for DtxBranch "
+ _xid);
- }
+ _logger.debug("Setting timeout to {}s for DtxBranch {}", timeout,
_xid);
if(_timeoutFuture != null)
{
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Attempting to cancel previous timeout task
future for DtxBranch " + _xid);
- }
+ _logger.debug("Attempting to cancel previous timeout task future
for DtxBranch {}", _xid);
boolean succeeded = _timeoutFuture.cancel(false);
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Cancelling previous timeout task " + (succeeded
? "succeeded" : "failed")
- + " for DtxBranch " + _xid);
- }
+ _logger.debug("Cancelling previous timeout task {} for DtxBranch
{}", (succeeded ? "succeeded" : "failed"), _xid);
}
_timeout = timeout;
@@ -140,20 +130,13 @@ public class DtxBranch
{
long delay = 1000*_timeout;
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Scheduling timeout and rollback after " +
delay/1000 +
- "s for DtxBranch " + _xid);
- }
+ _logger.debug("Scheduling timeout and rollback after {}s for
DtxBranch {}", delay/1000, _xid);
_timeoutFuture = _vhost.scheduleTask(delay, new Runnable()
{
public void run()
{
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Timing out DtxBranch " + _xid);
- }
+ _logger.debug("Timing out DtxBranch {}", _xid);
setState(State.TIMEDOUT);
rollback();
@@ -230,10 +213,7 @@ public class DtxBranch
public void prepare() throws StoreException
{
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Performing prepare for DtxBranch " + _xid);
- }
+ _logger.debug("Performing prepare for DtxBranch {}", _xid);
Transaction txn = _store.newTransaction();
_storedXidRecord = txn.recordXid(_xid.getFormat(),
@@ -248,26 +228,16 @@ public class DtxBranch
public synchronized void rollback() throws StoreException
{
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Performing rollback for DtxBranch " + _xid);
- }
+ _logger.debug("Performing rollback for DtxBranch {}", _xid);
if(_timeoutFuture != null)
{
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Attempting to cancel previous timeout task
future for DtxBranch " + _xid);
- }
+ _logger.debug("Attempting to cancel previous timeout task future
for DtxBranch {}", _xid);
boolean succeeded = _timeoutFuture.cancel(false);
_timeoutFuture = null;
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Cancelling previous timeout task " + (succeeded
? "succeeded" : "failed")
- + " for DtxBranch " + _xid);
- }
+ _logger.debug("Cancelling previous timeout task {} for DtxBranch
{}", (succeeded ? "succeeded" : "failed"), _xid);
}
if(_transaction != null)
@@ -290,26 +260,16 @@ public class DtxBranch
public void commit() throws StoreException
{
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Performing commit for DtxBranch " + _xid);
- }
+ _logger.debug("Performing commit for DtxBranch {}", _xid);
if(_timeoutFuture != null)
{
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Attempting to cancel previous timeout task
future for DtxBranch " + _xid);
- }
+ _logger.debug("Attempting to cancel previous timeout task future
for DtxBranch {}", _xid);
boolean succeeded = _timeoutFuture.cancel(false);
_timeoutFuture = null;
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Cancelling previous timeout task " + (succeeded
? "succeeded" : "failed")
- + " for DtxBranch " + _xid);
- }
+ _logger.debug("Cancelling previous timeout task {} for DtxBranch
{}", (succeeded ? "succeeded" : "failed"), _xid);
}
if(_transaction == null)
Added:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/QpidLoggerTurboFilterTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/QpidLoggerTurboFilterTest.java?rev=1689268&view=auto
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/QpidLoggerTurboFilterTest.java
(added)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/QpidLoggerTurboFilterTest.java
Sun Jul 5 17:46:21 2015
@@ -0,0 +1,102 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.logging;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.Logger;
+
+import org.apache.qpid.test.utils.QpidTestCase;
+
+public class QpidLoggerTurboFilterTest extends QpidTestCase
+{
+ private LoggerContext _loggerContext;
+ private QpidLoggerTurboFilter _turboFilter;
+
+ @Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ _loggerContext = new LoggerContext();
+ _turboFilter =
QpidLoggerTurboFilter.installIfNecessary(_loggerContext);
+
+ }
+
+ public void testDebugOffByDefault()
+ {
+ Logger fooLogger = _loggerContext.getLogger("foo");
+ if(fooLogger.isDebugEnabled())
+ {
+ fail("debug should not be enabled by default");
+ }
+ }
+
+
+ public void testInstallFilterWorksCorrectly()
+ {
+ Logger fooBarLogger = _loggerContext.getLogger("foo.bar");
+ if(fooBarLogger.isDebugEnabled())
+ {
+ fail("debug should not be enabled by default");
+ }
+ if(fooBarLogger.isInfoEnabled())
+ {
+ fail("info should not be enabled by default");
+ }
+
+ final LoggerNameAndLevelFilter allFooInfo = new
LoggerNameAndLevelFilter("foo.*", Level.INFO);
+ _turboFilter.filterAdded(allFooInfo);
+
+ if(!fooBarLogger.isInfoEnabled())
+ {
+ fail("info should be enabled after filter added");
+ }
+ if(fooBarLogger.isDebugEnabled())
+ {
+ fail("debug should not be enabled after info enabled");
+ }
+
+ final LoggerNameAndLevelFilter fooBarDebugFilter = new
LoggerNameAndLevelFilter("foo.bar", Level.DEBUG);
+ _turboFilter.filterAdded(fooBarDebugFilter);
+ if(!fooBarLogger.isDebugEnabled())
+ {
+ fail("debug should now be enabled");
+ }
+ final Logger fooBazLogger = _loggerContext.getLogger("foo.baz");
+ if(fooBazLogger.isDebugEnabled())
+ {
+ fail("debug should not be enabled after for foo.baz");
+ }
+
+ _turboFilter.filterRemoved(allFooInfo);
+ if(!fooBarLogger.isInfoEnabled())
+ {
+ fail("info should be still be enabled fo foo.bar");
+ }
+
+ if(fooBazLogger.isInfoEnabled())
+ {
+ fail("info should not still be enabled fo foo.baz");
+ }
+
+
+ }
+}
Propchange:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/QpidLoggerTurboFilterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
(original)
+++
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
Sun Jul 5 17:46:21 2015
@@ -61,10 +61,8 @@ public class AclRulePredicates
_properties.put(property, value);
}
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Parsed " + property + " with value " + value);
- }
+
+ _logger.debug("Parsed {} with value {}", property, value);
}
private void checkFirewallRuleNotAlreadyDefined(String key, String value)
Modified:
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
(original)
+++
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
Sun Jul 5 17:46:21 2015
@@ -84,10 +84,7 @@ public class PlainConfiguration implemen
try(Reader fileReader = configReader)
{
- if(_logger.isDebugEnabled())
- {
- _logger.debug("About to load ACL file");
- }
+ _logger.debug("About to load ACL file");
_st = new StreamTokenizer(new BufferedReader(fileReader));
_st.resetSyntax(); // setup the tokenizer
Modified:
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
(original)
+++
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
Sun Jul 5 17:46:21 2015
@@ -132,18 +132,14 @@ public class RuleSet implements EventLog
// Save the rules we selected
objects.put(objectType, filtered);
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Cached " + objectType + " RulesList: " +
filtered);
- }
+
+ _logger.debug("Cached {} RulesList: {}", objectType, filtered);
}
// Return the cached rules
List<Rule> rules = objects.get(objectType);
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Returning RuleList: " + rules);
- }
+
+ _logger.debug("Returning RuleList: {}", rules);
return rules;
}
@@ -290,29 +286,23 @@ public class RuleSet implements EventLog
{
ClientAction action = new ClientAction(operation, objectType,
properties);
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Checking action: " + action);
- }
+ _logger.debug("Checking action: {}", action);
// get the list of rules relevant for this request
List<Rule> rules = getRules(subject, operation, objectType);
if (rules == null)
{
- if(_logger.isDebugEnabled())
- {
- _logger.debug("No rules found, returning default result");
- }
+
+ _logger.debug("No rules found, returning default result");
+
return getDefault();
}
// Iterate through a filtered set of rules dealing with this identity
and operation
for (Rule rule : rules)
{
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Checking against rule: " + rule);
- }
+
+ _logger.debug("Checking against rule: {}", rule);
if (action.matches(rule.getAclAction(), addressOfClient))
{
Modified:
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java
(original)
+++
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java
Sun Jul 5 17:46:21 2015
@@ -51,10 +51,8 @@ public class HostnameFirewallRule implem
_hostnamePatterns[i++] = Pattern.compile(hostname);
}
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Created " + this);
- }
+ _logger.debug("Created {}", this);
+
}
@Override
@@ -79,10 +77,7 @@ public class HostnameFirewallRule implem
}
}
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Hostname " + hostname + " matches no configured
hostname patterns");
- }
+ _logger.debug("Hostname {} matches no configured hostname patterns",
hostname);
return false;
}
Modified:
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java
(original)
+++
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java
Sun Jul 5 17:46:21 2015
@@ -51,10 +51,7 @@ public class NetworkFirewallRule impleme
}
}
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Created " + this);
- }
+ _logger.debug("Created {}", this);
}
@Override
@@ -64,18 +61,14 @@ public class NetworkFirewallRule impleme
{
if (network.contains(ip))
{
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Client address " + ip + " matches
configured network " + network);
- }
+
+ _logger.debug("Client address {} matches configured network
{}", ip, network);
+
return true;
}
}
- if(_logger.isDebugEnabled())
- {
- _logger.debug("Client address " + ip + " does not match any
configured networks");
- }
+ _logger.debug("Client address {} does not match any configured
networks", ip);
return false;
}
Modified:
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java?rev=1689268&r1=1689267&r2=1689268&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
(original)
+++
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
Sun Jul 5 17:46:21 2015
@@ -61,10 +61,8 @@ public class DefaultAccessControl implem
{
_fileName = name;
_eventLogger = eventLogger;
- if (_logger.isDebugEnabled())
- {
- _logger.debug("Creating AccessControl instance");
- }
+
+ _logger.debug("Creating AccessControl instance");
}
DefaultAccessControl(RuleSet rs)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
