From 1b1fe6fd0820a3671f37dc926248bc3e79d66140 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sun, 18 Feb 2018 11:01:14 +0300
Subject: server: move xmpp logging to debug level
---
.../src/main/java/com/juick/server/XMPPConnection.java | 2 +-
juick-server/src/main/java/com/juick/server/XMPPServer.java | 12 ++++++------
.../src/main/java/com/juick/server/xmpp/s2s/Connection.java | 2 +-
.../main/java/com/juick/server/xmpp/s2s/ConnectionIn.java | 12 ++++++------
.../main/java/com/juick/server/xmpp/s2s/ConnectionOut.java | 6 +++---
5 files changed, 17 insertions(+), 17 deletions(-)
(limited to 'juick-server/src/main/java/com/juick')
diff --git a/juick-server/src/main/java/com/juick/server/XMPPConnection.java b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
index 09c30899..967f5c47 100644
--- a/juick-server/src/main/java/com/juick/server/XMPPConnection.java
+++ b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
@@ -263,7 +263,7 @@ public class XMPPConnection implements AutoCloseable {
void route(Stanza stanza) {
try {
String xml = stanzaToString(stanza);
- logger.info("stream router (out): {}", xml);
+ logger.debug("stream router (out): {}", xml);
bot.sendNotification(stanza);
} catch (XMLStreamException | JAXBException e) {
logger.error("JAXB exception", e);
diff --git a/juick-server/src/main/java/com/juick/server/XMPPServer.java b/juick-server/src/main/java/com/juick/server/XMPPServer.java
index 86a855a7..a75a7131 100644
--- a/juick-server/src/main/java/com/juick/server/XMPPServer.java
+++ b/juick-server/src/main/java/com/juick/server/XMPPServer.java
@@ -202,7 +202,7 @@ public class XMPPServer implements ConnectionListener, AutoCloseable {
xmppStreamWriter.flush();
xmppStreamWriter.close();
String xml = stanzaWriter.toString();
- logger.info("s2s (out): {}", xml);
+ logger.debug("s2s (out): {}", xml);
sendOut(Jid.of(s.getTo().getDomain()), xml);
} catch (XMLStreamException | JAXBException e1) {
logger.info("jaxb exception", e1);
@@ -305,7 +305,7 @@ public class XMPPServer implements ConnectionListener, AutoCloseable {
@Override
public void starttls(ConnectionIn connection) {
- logger.info("stream {} securing", connection.streamID);
+ logger.debug("stream {} securing", connection.streamID);
connection.sendStanza("");
try {
connection.setSocket(sc.getSocketFactory().createSocket(connection.getSocket(), connection.getSocket().getInetAddress().getHostAddress(),
@@ -313,7 +313,7 @@ public class XMPPServer implements ConnectionListener, AutoCloseable {
((SSLSocket) connection.getSocket()).setUseClientMode(false);
((SSLSocket) connection.getSocket()).startHandshake();
connection.setSecured(true);
- logger.info("stream {} secured", connection.streamID);
+ logger.debug("stream {} secured", connection.streamID);
connection.restartParser();
} catch (XmlPullParserException | IOException sex) {
logger.warn("stream {} ssl error {}", connection.streamID, sex);
@@ -331,7 +331,7 @@ public class XMPPServer implements ConnectionListener, AutoCloseable {
socket.getPort(), true);
((SSLSocket) socket).startHandshake();
connection.setSecured(true);
- logger.info("stream {} secured", connection.getStreamID());
+ logger.debug("stream {} secured", connection.getStreamID());
connection.setInputStream(socket.getInputStream());
connection.setOutputStream(socket.getOutputStream());
connection.restartStream();
@@ -374,10 +374,10 @@ public class XMPPServer implements ConnectionListener, AutoCloseable {
@Override
public void ready(ConnectionOut connection) {
- logger.info("stream to {} {} ready", connection.to, connection.getStreamID());
+ logger.debug("stream to {} {} ready", connection.to, connection.getStreamID());
String cache = getFromCache(connection.to);
if (cache != null) {
- logger.info("stream to {} {} sending cache", connection.to, connection.getStreamID());
+ logger.debug("stream to {} {} sending cache", connection.to, connection.getStreamID());
connection.send(cache);
}
}
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/s2s/Connection.java b/juick-server/src/main/java/com/juick/server/xmpp/s2s/Connection.java
index d745a406..6bf61169 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/s2s/Connection.java
+++ b/juick-server/src/main/java/com/juick/server/xmpp/s2s/Connection.java
@@ -93,7 +93,7 @@ public class Connection {
public void closeConnection() {
if (streamID != null) {
- logger.info("closing stream {}", streamID);
+ logger.debug("closing stream {}", streamID);
}
try {
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionIn.java b/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionIn.java
index a658dbde..dc7b3af9 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionIn.java
+++ b/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionIn.java
@@ -88,7 +88,7 @@ public class ConnectionIn extends Connection implements Runnable {
if (tag.equals("result") && parser.getNamespace().equals(NS_DB)) {
String dfrom = parser.getAttributeValue(null, "from");
String to = parser.getAttributeValue(null, "to");
- logger.info("stream from {} to {} {} asking for dialback", dfrom, to, streamID);
+ logger.debug("stream from {} to {} {} asking for dialback", dfrom, to, streamID);
if (dfrom.endsWith(xmpp.getJid().toEscapedString()) && (dfrom.equals(xmpp.getJid().toEscapedString())
|| dfrom.endsWith("." + xmpp.getJid()))) {
logger.warn("stream from {} is invalid", dfrom);
@@ -117,19 +117,19 @@ public class ConnectionIn extends Connection implements Runnable {
}
if (valid[0]) {
sendStanza("");
- logger.info("stream from {} {} dialback verify valid", vfrom, streamID);
+ logger.debug("stream from {} {} dialback verify valid", vfrom, streamID);
} else {
sendStanza("");
logger.warn("stream from {} {} dialback verify invalid", vfrom, streamID);
}
} else if (tag.equals("presence") && checkFromTo(parser)) {
String xml = XmlUtils.parseToString(parser, false);
- logger.info("stream {} presence: {}", streamID, xml);
+ logger.debug("stream {} presence: {}", streamID, xml);
xmpp.onStanzaReceived(xml);
} else if (tag.equals("message") && checkFromTo(parser)) {
updateTsRemoteData();
String xml = XmlUtils.parseToString(parser, false);
- logger.info("stream {} message: {}", streamID, xml);
+ logger.debug("stream {} message: {}", streamID, xml);
xmpp.onStanzaReceived(xml);
} else if (tag.equals("iq") && checkFromTo(parser)) {
@@ -137,7 +137,7 @@ public class ConnectionIn extends Connection implements Runnable {
String type = parser.getAttributeValue(null, "type");
String xml = XmlUtils.parseToString(parser, false);
if (type == null || !type.equals("error")) {
- logger.info("stream {} iq: {}", streamID, xml);
+ logger.debug("stream {} iq: {}", streamID, xml);
xmpp.onStanzaReceived(xml);
}
} else if (!isSecured() && tag.equals("starttls")) {
@@ -190,7 +190,7 @@ public class ConnectionIn extends Connection implements Runnable {
sendStanza("");
if (type.equals("valid")) {
from.add(sfrom);
- logger.info("stream from {} {} ready", sfrom, streamID);
+ logger.debug("stream from {} {} ready", sfrom, streamID);
}
}
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionOut.java b/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionOut.java
index fb95f0e4..e3bd53e9 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionOut.java
+++ b/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionOut.java
@@ -89,7 +89,7 @@ public class ConnectionOut extends Stream {
throw new Exception("stream to " + to + " invalid first packet");
}
- logger.info("stream to {} {} open", to, streamID);
+ logger.debug("stream to {} {} open", to, streamID);
boolean xmppversionnew = parser.getAttributeValue(null, "version") != null;
if (!xmppversionnew) {
processDialback();
@@ -107,7 +107,7 @@ public class ConnectionOut extends Stream {
streamReady = true;
listener.ready(this);
} else {
- logger.info("stream to {} {} dialback fail", to, streamID);
+ logger.warn("stream to {} {} dialback fail", to, streamID);
}
XmlUtils.skip(parser);
} else if (tag.equals("verify") && parser.getNamespace().equals(NS_DB)) {
@@ -120,7 +120,7 @@ public class ConnectionOut extends Stream {
StreamFeatures features = StreamFeatures.parse(parser);
if (listener != null && !secured && features.STARTTLS >= 0
&& listener.securing(this)) {
- logger.info("stream to {} {} securing", to.toEscapedString(), streamID);
+ logger.debug("stream to {} {} securing", to.toEscapedString(), streamID);
send("");
} else {
processDialback();
--
cgit v1.2.3