[hibernate-commits] Hibernate SVN: r19287 - search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups.

[hibernate-commits at lists.jboss.org]

Author: sannegrinovero
Date: 2010-04-23 13:31:04 -0400 (Fri, 23 Apr 2010)
New Revision: 19287

Modified:
   search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsBackendQueueProcessor.java
   search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsBackendQueueProcessorFactory.java
   search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsMasterMessageListener.java
Log:
HSEARCH-514 logging and typo improvements in JGroups backend

Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsBackendQueueProcessor.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsBackendQueueProcessor.java	2010-04-23 17:09:47 UTC (rev 19286)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsBackendQueueProcessor.java	2010-04-23 17:31:04 UTC (rev 19287)
@@ -45,7 +45,7 @@
  */
 public class JGroupsBackendQueueProcessor implements Runnable {
 
-	protected static final Logger log = LoggerFactory.make();
+	private static final Logger log = LoggerFactory.make();
 
 	private final JGroupsBackendQueueProcessorFactory factory;
 	private final List<LuceneWork> queue;
@@ -57,8 +57,11 @@
 
 	@SuppressWarnings("unchecked")
 	public void run() {
+		boolean trace = log.isTraceEnabled();
 		List<LuceneWork> filteredQueue = new ArrayList<LuceneWork>( queue );
-		log.trace( "Preparing {} Lucene works to be sent to master node.", filteredQueue.size() );
+		if ( trace ) {
+			log.trace( "Preparing {} Lucene works to be sent to master node.", filteredQueue.size() );
+		}
 
 		for ( LuceneWork work : queue ) {
 			if ( work instanceof OptimizeLuceneWork ) {
@@ -66,14 +69,16 @@
 				filteredQueue.remove( work );
 			}
 		}
-		log.trace(
+		if ( trace ) {
+			log.trace(
 				"Filtering: optimized Lucene works are not going to be sent to master node. There is {} Lucene works after filtering.",
 				filteredQueue.size()
-		);
-		if ( filteredQueue.size() == 0 ) {
-			log.trace(
-					"Nothing to send. Propagating works to a cluster has been skipped."
 			);
+		}
+		if ( filteredQueue.isEmpty() ) {
+			if ( trace ) {
+				log.trace( "Nothing to send. Propagating works to a cluster has been skipped." );
+			}
 			return;
 		}
 
@@ -83,9 +88,9 @@
 		try {
 			Message message = new Message( null, factory.getAddress(), ( Serializable ) filteredQueue );
 			factory.getChannel().send( message );
-			log.trace(
-					"Lucene works have been sent from slave {} to master node.", factory.getAddress()
-			);
+			if ( trace ) {
+				log.trace( "Lucene works have been sent from slave {} to master node.", factory.getAddress() );
+			}
 		}
 		catch ( ChannelNotConnectedException e ) {
 			throw new SearchException(
@@ -96,6 +101,6 @@
 		catch ( ChannelClosedException e ) {
 			throw new SearchException( "Unable to send Lucene work. Attempt to send message on closed JGroups channel" );
 		}
-
 	}
+	
 }

Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsBackendQueueProcessorFactory.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsBackendQueueProcessorFactory.java	2010-04-23 17:09:47 UTC (rev 19286)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsBackendQueueProcessorFactory.java	2010-04-23 17:31:04 UTC (rev 19287)
@@ -51,7 +51,7 @@
  */
 public abstract class JGroupsBackendQueueProcessorFactory implements BackendQueueProcessorFactory {
 
-	protected static final Logger log = LoggerFactory.make();
+	private static final Logger log = LoggerFactory.make();
 
 	public static final String JGROUPS_PREFIX = Environment.WORKER_BACKEND + ".jgroups.";
 
@@ -97,7 +97,7 @@
 	}
 
 	/**
-	 * Reads configuration and builds channnel with its base.
+	 * Reads configuration and builds channel with its base.
 	 * In order of preference - we first look for an external JGroups file, then a set of XML properties, and
 	 * finally the legacy JGroups String properties.
 	 *
@@ -142,7 +142,7 @@
 
 		if ( channel == null ) {
 			log.info(
-					"Unable to use any JGroups configuration mechanisms provided in properties {}.  Using default JGroups configuration file!",
+					"Unable to use any JGroups configuration mechanisms provided in properties {}. Using default JGroups configuration file!",
 					props
 			);
 			try {

Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsMasterMessageListener.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsMasterMessageListener.java	2010-04-23 17:09:47 UTC (rev 19286)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsMasterMessageListener.java	2010-04-23 17:31:04 UTC (rev 19287)
@@ -66,11 +66,13 @@
 		}
 
 		if ( queue != null && !queue.isEmpty() ) {
-			log.debug(
+			if ( log.isDebugEnabled() ) {
+				log.debug(
 					"There are {} Lucene docs received from slave node {} to be processed by master",
 					queue.size(),
 					message.getSrc()
-			);
+				);
+			}
 			Runnable worker = getWorker( queue );
 			worker.run();
 		}