OF-205: Improve stats and configurability for hazelcast plugin

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/branches/pubsub_clustering@13293 b35dd754-fafc-0310-a699-88a17e54d16e

src/plugins/hazelcast/src/java/com/jivesoftware/util/cache/ClusteredCache.java

@@ -45,6 +45,7 @@ public class ClusteredCache implements Cache {
      */
     protected IMap map;
     private String name;
+    private long numberOfGets = 0;
 
     /**
      * Create a new cache using the supplied named cache as the actual cache implementation
@@ -81,6 +82,7 @@ public class ClusteredCache implements Cache {
     }
 
     public Object get(Object key) {
+    	numberOfGets++;
         return map.get(key);
     }
 
@@ -130,10 +132,8 @@ public class ClusteredCache implements Cache {
     }
 
     public long getCacheMisses() {
-    	LocalMapStats stats = map.getLocalMapStats();
-    	long gets = stats.getOperationStats().getNumberOfGets();
-    	long hits = stats.getHits();
-    	return gets > hits ? gets - hits : 0;
+    	long hits = map.getLocalMapStats().getHits();
+    	return numberOfGets > hits ? numberOfGets - hits : 0;
     }
 
     public int getCacheSize() {

src/plugins/hazelcast/src/java/com/jivesoftware/util/cache/ClusteredCacheFactory.java

@@ -38,6 +38,7 @@ import java.util.concurrent.locks.Lock;
 import org.jivesoftware.openfire.XMPPServer;
 import org.jivesoftware.openfire.cluster.ClusterNodeInfo;
 import org.jivesoftware.openfire.cluster.NodeID;
+import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.util.cache.Cache;
 import org.jivesoftware.util.cache.CacheFactoryStrategy;
 import org.jivesoftware.util.cache.CacheWrapper;
@@ -62,8 +63,10 @@ import com.hazelcast.core.MultiTask;
  */
 public class ClusteredCacheFactory implements CacheFactoryStrategy {
 
-	// TODO: make this a configurable setting
-    private static final long MAX_CLUSTER_EXECUTION_TIME = 30;
+    private static final long MAX_CLUSTER_EXECUTION_TIME = 
+    		JiveGlobals.getLongProperty("hazelcast.max.execution.seconds", 30);
+    private static final String HAZELCAST_CONFIG_FILE = 
+    		JiveGlobals.getProperty("hazelcast.config.xml.filename", "hazelcast-cache-config.xml");
 
 	private static Logger logger = LoggerFactory.getLogger(ClusteredCacheFactory.class);
 
@@ -90,7 +93,7 @@ public class ClusteredCacheFactory implements CacheFactoryStrategy {
             oldLoader = Thread.currentThread().getContextClassLoader();
             ClassLoader loader = new ClusterClassLoader();
             Thread.currentThread().setContextClassLoader(loader);
-            Config config = new ClasspathXmlConfig("hazelcast-cache-config.xml");
+            Config config = new ClasspathXmlConfig(HAZELCAST_CONFIG_FILE);
             config.setInstanceName("openfire");
         	hazelcast = Hazelcast.newHazelcastInstance(config);
             cluster = hazelcast.getCluster();