From 51c3528efa475e2fa149281455b40eebdfaf38d4 Mon Sep 17 00:00:00 2001 From: Torsten Grote <t@grobox.de> Date: Wed, 16 Mar 2016 19:09:05 -0300 Subject: [PATCH] Add log statements to MessageQueueManagerImpl in order to find bug #272 --- .../clients/MessageQueueManagerImpl.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/briar-core/src/org/briarproject/clients/MessageQueueManagerImpl.java b/briar-core/src/org/briarproject/clients/MessageQueueManagerImpl.java index b2503b7402..eb7b0fc6aa 100644 --- a/briar-core/src/org/briarproject/clients/MessageQueueManagerImpl.java +++ b/briar-core/src/org/briarproject/clients/MessageQueueManagerImpl.java @@ -21,6 +21,7 @@ import org.briarproject.api.sync.ValidationManager.IncomingMessageHook; import org.briarproject.util.ByteUtils; import java.util.ArrayList; +import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Map.Entry; @@ -63,9 +64,20 @@ class MessageQueueManagerImpl implements MessageQueueManager { QueueState queueState = loadQueueState(txn, queue.getId()); long queuePosition = queueState.outgoingPosition; queueState.outgoingPosition++; + if (LOG.isLoggable(INFO)) { + LOG.info("Sending message with position " + + queuePosition + " in group " + + queue.getId().hashCode() + " with transaction " + + txn.hashCode()); + } saveQueueState(txn, queue.getId(), queueState); QueueMessage q = queueMessageFactory.createMessage(queue.getId(), timestamp, queuePosition, body); + if (LOG.isLoggable(INFO)) { + LOG.info("First bytes of message: " + Arrays.toString( + Arrays.copyOfRange(q.getRaw(), 0, + QUEUE_MESSAGE_HEADER_LENGTH))); + } db.addLocalMessage(txn, q, queue.getClientId(), meta, true); return q; } @@ -196,7 +208,12 @@ class MessageQueueManagerImpl implements MessageQueueManager { if (LOG.isLoggable(INFO)) { LOG.info("Received message with position " + queuePosition + ", expecting " - + queueState.incomingPosition); + + queueState.incomingPosition + ". Received in group " + + m.getGroupId().hashCode() + " with transaction " + + txn.hashCode()); + LOG.info("First bytes of message: " + Arrays.toString( + Arrays.copyOfRange(m.getRaw(), 0, + QUEUE_MESSAGE_HEADER_LENGTH))); } if (queuePosition < queueState.incomingPosition) { // A message with this queue position has already been seen -- GitLab