增强监控

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@336 b9813039-fb51-4c41-a8b9-e21c2acb5095

src/test/java/com/alibaba/druid/pool/TestOracle.java

@@ -1,10 +1,16 @@
 package com.alibaba.druid.pool;
 
 import java.sql.Connection;
+import java.util.TreeMap;
+
+import javax.management.openmbean.TabularData;
 
 import junit.framework.TestCase;
 
-import com.alibaba.druid.pool.vendor.MySqlExceptionSorter;
+import com.alibaba.druid.pool.vendor.OracleExceptionSorter;
+import com.alibaba.druid.stat.JdbcStatManager;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 
 public class TestOracle extends TestCase {
 
@@ -23,10 +29,16 @@ public class TestOracle extends TestCase {
         dataSource.setUrl(jdbcUrl);
         dataSource.setUsername(user);
         dataSource.setPassword(password);
-        // dataSource.setFilters("stat");
-        dataSource.setExceptionSoter(MySqlExceptionSorter.class.getName());
+        dataSource.setFilters("stat");
+        dataSource.setExceptionSoter(OracleExceptionSorter.class.getName());
 
         Connection conn = dataSource.getConnection();
         conn.close();
+        
+        TabularData dataSourcesList = JdbcStatManager.getInstance().getDataSourceList();
+        for (Object item : dataSourcesList.values()) {
+            String text = JSON.toJSONString(item, SerializerFeature.UseISO8601DateFormat);
+            System.out.println(JSON.toJSONString(JSON.parseObject(text, TreeMap.class), true));
+        }
     }
 }

src/test/java/com/alibaba/druid/proxy/TestOracle.java

@@ -4,6 +4,7 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.Statement;
+import java.util.TreeMap;
 
 import javax.management.openmbean.TabularData;
 
@@ -11,20 +12,22 @@ import junit.framework.TestCase;
 
 import com.alibaba.druid.stat.JdbcStatManager;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 
 public class TestOracle extends TestCase {
+
     private String jdbcUrl;
     private String user;
     private String password;
 
     public void setUp() throws Exception {
         jdbcUrl = "jdbc:wrap-jdbc:filters=default:name=oracleTest:jdbc:oracle:thin:@10.20.149.85:1521:ocnauto";
-        jdbcUrl = "jdbc:wrap-jdbc:filters=default:name=oracleTest:jdbc:mock:xx";
+        // jdbcUrl = "jdbc:wrap-jdbc:filters=default:name=oracleTest:jdbc:mock:xx";
         user = "alibaba";
         password = "ccbuauto";
     }
-    
-    public void test_0 () throws Exception {
+
+    public void test_0() throws Exception {
         Connection conn = DriverManager.getConnection(jdbcUrl, user, password);
         Statement stmt = conn.createStatement();
         ResultSet rs = stmt.executeQuery("SELECT 1 FROM DUAL");
@@ -32,9 +35,12 @@ public class TestOracle extends TestCase {
         rs.close();
         stmt.close();
         conn.close();
-        
+
         TabularData dataSourcesList = JdbcStatManager.getInstance().getDataSourceList();
-        String text = JSON.toJSONString(dataSourcesList);
-        System.out.println(JSON.toJSONString(JSON.parse(text), true));
+        for (Object item : dataSourcesList.values()) {
+            String text = JSON.toJSONString(item, SerializerFeature.UseISO8601DateFormat);
+            System.out.println(JSON.toJSONString(JSON.parseObject(text, TreeMap.class), true));
+        }
+
     }
 }