Commit 66adbe39 authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger

HTTP binding now only logs if log.httpbind.enabled is set to true.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@10547 b35dd754-fafc-0310-a699-88a17e54d16e
parent e595dd6f
...@@ -20,6 +20,7 @@ import org.dom4j.io.XMPPPacketReader; ...@@ -20,6 +20,7 @@ import org.dom4j.io.XMPPPacketReader;
import org.jivesoftware.openfire.auth.UnauthorizedException; import org.jivesoftware.openfire.auth.UnauthorizedException;
import org.jivesoftware.openfire.net.MXParser; import org.jivesoftware.openfire.net.MXParser;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.JiveGlobals;
import org.mortbay.util.ajax.ContinuationSupport; import org.mortbay.util.ajax.ContinuationSupport;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory; import org.xmlpull.v1.XmlPullParserFactory;
...@@ -135,7 +136,9 @@ public class HttpBindServlet extends HttpServlet { ...@@ -135,7 +136,9 @@ public class HttpBindServlet extends HttpServlet {
return; return;
} }
System.out.println("HTTP RECV: " + document.asXML()); if (JiveGlobals.getBooleanProperty("log.httpbind.enabled", false)) {
System.out.println("HTTP RECV: " + document.asXML());
}
Element node = document.getRootElement(); Element node = document.getRootElement();
if (node == null || !"body".equals(node.getName())) { if (node == null || !"body".equals(node.getName())) {
Log.warn("Body missing from request content. [" + request.getRemoteAddr() + "]"); Log.warn("Body missing from request content. [" + request.getRemoteAddr() + "]");
...@@ -305,7 +308,9 @@ public class HttpBindServlet extends HttpServlet { ...@@ -305,7 +308,9 @@ public class HttpBindServlet extends HttpServlet {
content = "_BOSH_(\"" + StringEscapeUtils.escapeJavaScript(content) + "\")"; content = "_BOSH_(\"" + StringEscapeUtils.escapeJavaScript(content) + "\")";
} }
System.out.println("HTTP SENT: " + content); if (JiveGlobals.getBooleanProperty("log.httpbind.enabled", false)) {
System.out.println("HTTP SENT: " + content);
}
byte[] byteContent = content.getBytes("utf-8"); byte[] byteContent = content.getBytes("utf-8");
response.setContentLength(byteContent.length); response.setContentLength(byteContent.length);
response.getOutputStream().write(byteContent); response.getOutputStream().write(byteContent);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment