changes on redis

rjyo · Nov 28, 2011 · 0e024aa · 0e024aa
1 parent 26839df
commit 0e024aa
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/core/src/main/java/h2weibo/model/DBHelperFactory.java b/core/src/main/java/h2weibo/model/DBHelperFactory.java
@@ -16,13 +16,16 @@
 
 package h2weibo.model;
 
+import org.apache.log4j.Logger;
 import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.exceptions.JedisException;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
 public class DBHelperFactory {
+    private static final Logger log = Logger.getLogger(DBHelperFactory.class.getName());
 
 
     private static class JedisInvocationHandler implements InvocationHandler {
@@ -33,10 +36,19 @@ public JedisInvocationHandler(DBHelperImpl helper) {
         }
 
         public Object invoke(Object o, Method method, Object[] args) throws Throwable {
-            helper.prepareJedis();
-            Object result = method.invoke(helper, args);
-            helper.returnJedis();
-            return result;
+            try {
+                helper.prepareJedis();
+                Object result = method.invoke(helper, args);
+                helper.returnJedis();
+                return result;
+            } catch (JedisException e) {
+                log.error(e);
+                log.info("Trying to recover Jedis connection");
+                helper.returnBrokenJedis();
+                Object result = method.invoke(helper, args);
+                helper.returnJedis();
+                return result;
+            }
         }
     }
 

diff --git a/core/src/main/java/h2weibo/model/DBHelperImpl.java b/core/src/main/java/h2weibo/model/DBHelperImpl.java
@@ -52,6 +52,12 @@ void returnJedis() {
         jedis = null;
     }
 
+    void returnBrokenJedis() {
+        log.debug("Return borken Jedis");
+        pool.returnBrokenResource(jedis);
+        jedis = null;
+    }
+
     public Set<String> getAuthorizedIds() {
         return jedis.smembers(USER_SET_KEY);
     }

diff --git a/web/src/main/webapp/WEB-INF/v/layout/layout.vm b/web/src/main/webapp/WEB-INF/v/layout/layout.vm
@@ -30,4 +30,17 @@
 
 </body>
 
+<script type="text/javascript">
+  var _gauges = _gauges || [];
+  (function() {
+    var t   = document.createElement('script');
+    t.type  = 'text/javascript';
+    t.async = true;
+    t.id    = 'gauges-tracker';
+    t.setAttribute('data-site-id', '4ecbc293613f5d1d57000005');
+    t.src = '//secure.gaug.es/track.js';
+    var s = document.getElementsByTagName('script')[0];
+    s.parentNode.insertBefore(t, s);
+  })();
+</script>
 </html>