cqrenet/mxids
3
0
Fork 0
Code Pull Requests 10 Actions Releases Activity

Use proper ID when clearing invites from memory

Browse Source
This commit is contained in:
Maxime Dor
2017-09-14 03:56:21 +02:00
parent 8fbb45037c
commit 16efe93920
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/groovy/io/kamax/mxisd/invitation/InvitationManager.java
View File

@@ -138,7 +138,7 @@ public class InvitationManager {
ForkJoinPool.commonPool().awaitQuiescence(1, TimeUnit.MINUTES); ForkJoinPool.commonPool().awaitQuiescence(1, TimeUnit.MINUTES);
} }
private String getId(IThreePidInviteReply reply) { private String getIdForLog(IThreePidInviteReply reply) {
return reply.getInvite().getSender().getId() + ":" + reply.getInvite().getRoomId() + ":" + reply.getInvite().getMedium() + ":" + reply.getInvite().getAddress(); return reply.getInvite().getSender().getId() + ":" + reply.getInvite().getRoomId() + ":" + reply.getInvite().getMedium() + ":" + reply.getInvite().getAddress();
} }
@@ -225,7 +225,7 @@ public class InvitationManager {
public void lookupMappingsForInvites() { public void lookupMappingsForInvites() {
log.info("Checking for existing mapping for pending invites"); log.info("Checking for existing mapping for pending invites");
for (IThreePidInviteReply reply : invitations.values()) { for (IThreePidInviteReply reply : invitations.values()) {
log.info("Processing invite {}", getId(reply)); log.info("Processing invite {}", getIdForLog(reply));
ForkJoinPool.commonPool().submit(new MappingChecker(reply)); ForkJoinPool.commonPool().submit(new MappingChecker(reply));
} }
} }
@@ -285,7 +285,7 @@ public class InvitationManager {
if (statusCode >= 300) { if (statusCode >= 300) {
log.warn("Answer body: {}", IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8)); log.warn("Answer body: {}", IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8));
} else { } else {
invitations.remove(getId(reply)); invitations.remove(getId(reply.getInvite()));
storage.deleteInvite(reply.getId()); storage.deleteInvite(reply.getId());
log.info("Removed invite from internal store"); log.info("Removed invite from internal store");
} }
@@ -307,14 +307,14 @@ public class InvitationManager {
@Override @Override
public void run() { public void run() {
try { try {
log.info("Searching for mapping created since invite {} was created", getId(reply)); log.info("Searching for mapping created since invite {} was created", getIdForLog(reply));
Optional<SingleLookupReply> result = lookupMgr.find(reply.getInvite().getMedium(), reply.getInvite().getAddress(), true); Optional<SingleLookupReply> result = lookupMgr.find(reply.getInvite().getMedium(), reply.getInvite().getAddress(), true);
if (result.isPresent()) { if (result.isPresent()) {
SingleLookupReply lookup = result.get(); SingleLookupReply lookup = result.get();
log.info("Found mapping for pending invite {}", getId(reply)); log.info("Found mapping for pending invite {}", getIdForLog(reply));
publishMapping(reply, lookup.getMxid().getId()); publishMapping(reply, lookup.getMxid().getId());
} else { } else {
log.info("No mapping for pending invite {}", getId(reply)); log.info("No mapping for pending invite {}", getIdForLog(reply));
} }
} catch (Throwable t) { } catch (Throwable t) {
log.error("Unable to process invite", t); log.error("Unable to process invite", t);