You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2010/06/02 18:41:22 UTC
svn commit: r950636 - in /qpid/trunk/qpid/java:
broker-plugins/experimental/slowconsumerdetection/
broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/
broker-plugins/experimental/slowconsumerdetect...
Author: ritchiem
Date: Wed Jun 2 16:41:22 2010
New Revision: 950636
URL: http://svn.apache.org/viewvc?rev=950636&view=rev
Log:
QPID-1447 : Add Logging to SCD. Update PluginManager to expose the logging packages via OSGi.
Added:
qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/
qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/LogMessages.properties
Modified:
qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/MANIFEST.MF
qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/build.xml
qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java
qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
Modified: qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/MANIFEST.MF
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/MANIFEST.MF?rev=950636&r1=950635&r2=950636&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/MANIFEST.MF (original)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/MANIFEST.MF Wed Jun 2 16:41:22 2010
@@ -15,6 +15,8 @@ Import-Package: org.osgi.framework,
org.apache.qpid.server.registry,
org.apache.qpid.server.plugins,
org.apache.qpid.server.protocol,
+ org.apache.qpid.server.logging,
+ org.apache.qpid.server.logging.actors,
org.apache.qpid.protocol,
org.apache.qpid.framing,
org.apache.qpid,
Modified: qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/build.xml?rev=950636&r1=950635&r2=950636&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/build.xml Wed Jun 2 16:41:22 2010
@@ -29,4 +29,46 @@ nn - or more contributor license agreeme
<target name="bundle" depends="bundle-tasks"/>
+
+
+ <target name="precompile" depends="gen_logging"/>
+
+
+ <property name="velocity.properties.dir" value="src/main/java/org/apache/qpid/server/virtualhost/plugin/logging"/>
+
+ <property name="gentools.home" location="${project.root}/../gentools" />
+
+ <property name="generated.package" value="org/apache/qpid/server/virtualhost/plugin/logging" />
+ <property name="generated.dir" location="${module.precompiled}/${generated.package}" />
+ <property name="velocity.compile.dir" value="${build.scratch}/broker/velocity"/>
+ <property name="velocity.timestamp" location="${generated.dir}/velocity.timestamp" />
+
+
+ <target name="check_velocity_deps">
+ <uptodate property="velocity.notRequired" targetfile="${velocity.timestamp}">
+ <srcfiles dir="${velocity.properties.dir}" includes="LogMessages**" />
+ <srcfiles dir="${project.root}/broker/src/velocity/" includes="**/*.java **/*.vm" />
+ </uptodate>
+ </target>
+
+
+
+
+ <target name="gen_logging" depends="check_velocity_deps" unless="velocity.notRequired">
+ <mkdir dir="${generated.dir}"/>
+ <java classname="org.apache.qpid.server.logging.GenerateLogMessages" fork="true" dir="${gentools.home}/src" failonerror="true">
+ <arg line="-j -o ${generated.dir} -t ${project.root}/broker/src/velocity/templates/org/apache/qpid/server/logging/messages -r org.apache.qpid.server.virtualhost.plugin.logging.LogMessages"/>
+ <classpath>
+ <pathelement path="${project.root}/broker-plugins/experimental/slowconsumerdetection/src/main/java"/>
+ <pathelement path="${velocity.compile.dir}" />
+ <fileset dir="${project.root}/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ <pathelement path="${gentools.home}/lib/velocity-1.4.jar" />
+ </classpath>
+ </java>
+ <touch file="${velocity.timestamp}" />
+ </target>
+
+
</project>
Modified: qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java?rev=950636&r1=950635&r2=950636&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java Wed Jun 2 16:41:22 2010
@@ -28,6 +28,7 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.plugin.logging.SlowConsumerDetectionMessages;
import org.apache.qpid.server.virtualhost.plugins.VirtualHostHouseKeepingPlugin;
import org.apache.qpid.server.virtualhost.plugins.VirtualHostPluginFactory;
@@ -73,10 +74,11 @@ class SlowConsumerDetection extends Virt
@Override
public void execute()
{
- _logger.info("Starting the SlowConsumersDetection job");
+ SlowConsumerDetectionMessages.SCD_RUNNING();
+
for (AMQQueue q : _virtualhost.getQueueRegistry().getQueues())
{
- _logger.debug("Checking consumer status for queue: " + q.getName());
+ SlowConsumerDetectionMessages.SCD_CHECKING_QUEUE(q.getName());
try
{
SlowConsumerDetectionQueueConfiguration config =
@@ -96,7 +98,8 @@ class SlowConsumerDetection extends Virt
// house keeping task from running.
}
}
- _logger.info("SlowConsumersDetection job completed.");
+
+ SlowConsumerDetectionMessages.SCD_COMPLETE();
}
public long getDelay()
@@ -113,7 +116,7 @@ class SlowConsumerDetection extends Virt
* Check the depth,messageSize,messageAge,messageCount values for this q
*
* @param q the queue to check
- * @param config
+ * @param config the queue configuration to compare against the queue state
*
* @return true if the queue has reached a threshold.
*/
@@ -127,12 +130,12 @@ class SlowConsumerDetection extends Virt
(config.getMessageAge() != 0 && q.getOldestMessageArrivalTime() >= config.getMessageAge()))
{
- if (_logger.isInfoEnabled())
+ if (_logger.isDebugEnabled())
{
- _logger.info("Detected Slow Consumer on Queue(" + q.getName() + ")");
- _logger.info("Queue Count:" + q.getMessageCount() + ":" + config.getMessageCount());
- _logger.info("Queue Depth:" + q.getQueueDepth() + ":" + config.getDepth());
- _logger.info("Queue Arrival:" + q.getOldestMessageArrivalTime() + ":" + config.getMessageAge());
+ _logger.debug("Detected Slow Consumer on Queue(" + q.getName() + ")");
+ _logger.debug("Queue Count:" + q.getMessageCount() + ":" + config.getMessageCount());
+ _logger.debug("Queue Depth:" + q.getQueueDepth() + ":" + config.getDepth());
+ _logger.debug("Queue Arrival:" + q.getOldestMessageArrivalTime() + ":" + config.getMessageAge());
}
return true;
Added: qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/LogMessages.properties
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/LogMessages.properties?rev=950636&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/LogMessages.properties (added)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/LogMessages.properties Wed Jun 2 16:41:22 2010
@@ -0,0 +1,8 @@
+SCD=SlowConsumerDetection
+SCD_RUNNING = SCD-1001 : Running
+SCD_COMPLETE = SCD-1002 : Complete
+SCD_CHECKING_QUEUE = SCD-1003 : Checking Status of Queue {0}
+
+TDP=TopicDeletePolicy
+TDP_DELETING_QUEUE = TDP-1001 : Deleting Queue
+TDP_DISCONNECTING = TDP-1002 : Disconnecting Session
\ No newline at end of file
Modified: qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java?rev=950636&r1=950635&r2=950636&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java Wed Jun 2 16:41:22 2010
@@ -28,9 +28,10 @@ import org.apache.qpid.server.binding.Bi
import org.apache.qpid.server.configuration.plugin.SlowConsumerDetectionPolicyConfiguration;
import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin;
import org.apache.qpid.server.exchange.TopicExchange;
-import org.apache.qpid.server.plugins.Plugin;
+import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.virtualhost.plugin.logging.TopicDeletePolicyMessages;
import org.apache.qpid.slowconsumerdetection.policies.SlowConsumerPolicyPlugin;
import org.apache.qpid.slowconsumerdetection.policies.SlowConsumerPolicyPluginFactory;
@@ -88,6 +89,7 @@ public class TopicDeletePolicy implement
try
{
+ CurrentActor.get().message(owner.getLogSubject(),TopicDeletePolicyMessages.TDP_DISCONNECTING());
// Close the consumer . this will cause autoDelete Queues to be purged
owner.getConnectionModel().
closeSession(owner, AMQConstant.RESOURCE_ERROR,
@@ -96,6 +98,7 @@ public class TopicDeletePolicy implement
// Actively delete non autoDelete queues if deletePersistent is set
if (!q.isAutoDelete() && _configuration.deletePersistent())
{
+ CurrentActor.get().message(q.getLogSubject(), TopicDeletePolicyMessages.TDP_DELETING_QUEUE());
q.delete();
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java?rev=950636&r1=950635&r2=950636&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java Wed Jun 2 16:41:22 2010
@@ -117,6 +117,8 @@ public class PluginManager implements Cl
"org.apache.qpid.server.configuration.plugins; version=0.7," +
"org.apache.qpid.server.configuration.management; version=0.7," +
"org.apache.qpid.server.exchange; version=0.7," +
+ "org.apache.qpid.server.logging; version=0.7," +
+ "org.apache.qpid.server.logging.actors; version=0.7," +
"org.apache.qpid.server.management; version=0.7," +
"org.apache.qpid.server.persistent; version=0.7," +
"org.apache.qpid.server.plugins; version=0.7," +
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org