diff --git a/src/main/java/com/alibaba/druid/support/monitor/PushService.java b/src/main/java/com/alibaba/druid/support/monitor/PushService.java index 1ccfcbdc5c..62f232f48c 100644 --- a/src/main/java/com/alibaba/druid/support/monitor/PushService.java +++ b/src/main/java/com/alibaba/druid/support/monitor/PushService.java @@ -83,7 +83,7 @@ public class PushService { protected void execute() { Map data = collectAndReset(); String json = JSONUtils.toJSONString(data); - push(json); + push("data=" + json); } /** diff --git a/src/main/java/com/alibaba/druid/support/monitor/PushServiceListener.java b/src/main/java/com/alibaba/druid/support/monitor/PushServiceListener.java new file mode 100644 index 0000000000..112f503baf --- /dev/null +++ b/src/main/java/com/alibaba/druid/support/monitor/PushServiceListener.java @@ -0,0 +1,38 @@ +package com.alibaba.druid.support.monitor; + +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; + +public class PushServiceListener implements ServletContextListener { + + private final static Log LOG = LogFactory.getLog(PushServiceListener.class); + + private final static String MONITOR_SERVER_URL = "monitorServerUrl"; + + @Override + public void contextInitialized(ServletContextEvent sce) { + PushService pushService = PushService.getInstance(); + String serverUrl = sce.getServletContext().getInitParameter(MONITOR_SERVER_URL); + if (serverUrl == null) { + LOG.error(MONITOR_SERVER_URL + " can't be null"); + return; + } + + if (LOG.isDebugEnabled()) { + LOG.debug(MONITOR_SERVER_URL + "= " + serverUrl); + } + pushService.setServerUrl(serverUrl); + pushService.start(); + + } + + @Override + public void contextDestroyed(ServletContextEvent sce) { + // TODO Auto-generated method stub + + } + +} diff --git a/src/main/java/com/alibaba/druid/util/HttpClientUtils.java b/src/main/java/com/alibaba/druid/util/HttpClientUtils.java index 8fdc6e8bce..a0e5a742ed 100644 --- a/src/main/java/com/alibaba/druid/util/HttpClientUtils.java +++ b/src/main/java/com/alibaba/druid/util/HttpClientUtils.java @@ -29,29 +29,46 @@ public class HttpClientUtils { conn.setDoOutput(true); conn.setConnectTimeout(1000 * 5); wr = new OutputStreamWriter(conn.getOutputStream()); - wr.write(""); + + wr.write(data); wr.flush(); - // Get the response - reader = new BufferedReader(new InputStreamReader(conn.getInputStream())); - responseBuilder = new StringBuilder(); - String line = null; - while ((line = reader.readLine()) != null) { - responseBuilder.append(line + "\n"); + if (LOG.isDebugEnabled()) { + reader = new BufferedReader(new InputStreamReader(conn.getInputStream())); + responseBuilder = new StringBuilder(); + String line = null; + while ((line = reader.readLine()) != null) { + responseBuilder.append(line + "\n"); + } + LOG.debug(responseBuilder.toString()); } - wr.close(); - reader.close(); - - System.out.println(responseBuilder.toString()); } catch (IOException e) { LOG.error("", e); + } finally { + + if (wr != null) { + try { + wr.close(); + } catch (IOException e) { + LOG.error("close error", e); + } + } + + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + LOG.error("close error", e); + } + } + } return false; } public static void main(String args[]) { - post("http://www.alibaba.com", "", 6000); + post("http://www.alibaba.com/trade/search", "fsb=y&IndexArea=product_en&CatId=&SearchText=test", 6000); } }