diff options
Diffstat (limited to 'juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java')
| -rw-r--r-- | juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java b/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java index 7bef76ab..3517462b 100644 --- a/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java +++ b/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java @@ -46,7 +46,7 @@ public class ConnectionRouter extends Connection implements Runnable { @Override public void run() { - logger.info("STREAM ROUTER START"); + logger.info("stream router start"); @SuppressWarnings("unchecked") RetryPolicy retryPolicy = new RetryPolicy() .withBackoff(1, 30, TimeUnit.SECONDS) .withJitter(0.1) @@ -69,7 +69,7 @@ public class ConnectionRouter extends Connection implements Runnable { parser.next(); // stream:stream streamID = parser.getAttributeValue(null, "id"); if (streamID == null || streamID.isEmpty()) { - throw new Exception("FAIL ON FIRST PACKET"); + throw new Exception("fail on first packet"); } msg = "<handshake>" + DigestUtils.sha1Hex(streamID + password) + "</handshake>"; @@ -78,10 +78,10 @@ public class ConnectionRouter extends Connection implements Runnable { parser.next(); if (!parser.getName().equals("handshake")) { - throw new Exception("NO HANDSHAKE"); + throw new Exception("no handshake"); } XmlUtils.skip(parser); - logger.info("STREAM ROUTER OPEN"); + logger.info("stream router open"); while (parser.next() != XmlPullParser.END_DOCUMENT) { if (parser.getEventType() != XmlPullParser.START_TAG) { @@ -96,7 +96,7 @@ public class ConnectionRouter extends Connection implements Runnable { if (jid.Host.equals(componentName)) { if (tag.equals("message")) { Message xmsg = Message.parse(parser, xmpp.childParsers); - logger.info("STREAM ROUTER (PROCESS): {}", xmsg); + logger.info("stream router (process): {}", xmsg); JuickMessage jmsg = (JuickMessage) xmsg.getChild(JuickMessage.XMLNS); if (jmsg != null) { if (jid.Username != null && jid.Username.equals("recomm")) { @@ -112,23 +112,23 @@ public class ConnectionRouter extends Connection implements Runnable { } } else if (jid.Host.endsWith(xmpp.HOSTNAME) && (jid.Host.equals(xmpp.HOSTNAME) || jid.Host.endsWith("." + xmpp.HOSTNAME))) { String xml = XmlUtils.parseToString(parser, true); - logger.info("STREAM ROUTER: {}", xml); + logger.info("stream router: {}", xml); } else { String xml = XmlUtils.parseToString(parser, true); - logger.info("STREAM ROUTER (OUT): {}", xml); + logger.info("stream router (out): {}", xml); xmpp.sendOut(jid.Host, xml); } } else { - if (logger.isInfoEnabled()) // prevent parseToString for disabled logs - logger.info("STREAM ROUTER (NO TO): {}", XmlUtils.parseToString(parser, true)); + String invalidStanza = XmlUtils.parseToString(parser, true); + logger.info("stream router (no to): {}", invalidStanza); } } else { - if (logger.isInfoEnabled()) // prevent parseToString for disabled logs - logger.info("STREAM ROUTER: {}", XmlUtils.parseToString(parser, true)); + String unknownStanza = XmlUtils.parseToString(parser, true); + logger.info("stream router (unknown): {}", unknownStanza); } } - logger.warn("STREAM ROUTER FINISHED"); + logger.warn("stream router finished"); } catch (Exception e) { logger.warn("router error, reconnection ", e); execution.recordFailure(e); |