From 142ab42d995e04853747e86c724a9ddedb85fff1 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 26 Jun 2019 10:19:50 +0200
Subject: [PATCH] Allowing for disabling the messaging system, e.g. on test
servers
---
.../vips/logic/messaging/MessagingBean.java | 27 ++++++++++++-------
.../logic/messaging/UniversalMessage.java | 7 ++++-
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/main/java/no/nibio/vips/logic/messaging/MessagingBean.java b/src/main/java/no/nibio/vips/logic/messaging/MessagingBean.java
index c3527964..ca1cc484 100755
--- a/src/main/java/no/nibio/vips/logic/messaging/MessagingBean.java
+++ b/src/main/java/no/nibio/vips/logic/messaging/MessagingBean.java
@@ -108,20 +108,29 @@ public class MessagingBean {
//ResteasyWebTarget target = client.target("http://logic.testvips2.nibio.no");
UniversalMessagingServiceClient umClient = target.proxy(UniversalMessagingServiceClient.class);
-
- try
+ if (
+ System.getProperty("no.nibio.vips.logic.DISABLE_MESSAGING_SYSTEM") == null
+ || System.getProperty("no.nibio.vips.logic.DISABLE_MESSAGING_SYSTEM").equals("false")
+ )
{
- //System.out.println(new ObjectMapper().writeValueAsString(um));
- Response r = umClient.sendMessage(new ObjectMapper().writeValueAsString(uMessage));
+ try
+ {
+ //System.out.println(new ObjectMapper().writeValueAsString(um));
+ Response r = umClient.sendMessage(new ObjectMapper().writeValueAsString(uMessage));
- // TODO: Handle result
+ // TODO: Handle result
- String result = r.readEntity(String.class);
- System.out.println(result);
+ String result = r.readEntity(String.class);
+ //System.out.println(result);
+ }
+ catch(JsonProcessingException ex)
+ {
+ // Handle error
+ }
}
- catch(JsonProcessingException ex)
+ else
{
- // Handle error
+ System.out.println("Messaging system disabled. This message was not sent: " + uMessage.toString());
}
return uMessage;
diff --git a/src/main/java/no/nibio/vips/logic/messaging/UniversalMessage.java b/src/main/java/no/nibio/vips/logic/messaging/UniversalMessage.java
index 1e0ea75f..8140c980 100755
--- a/src/main/java/no/nibio/vips/logic/messaging/UniversalMessage.java
+++ b/src/main/java/no/nibio/vips/logic/messaging/UniversalMessage.java
@@ -189,7 +189,12 @@ public class UniversalMessage implements Serializable {
@Override
public String toString() {
- return "no.nibio.vips.logic.messaging.UniversalMessage[ universalMessageId=" + universalMessageId + " ]";
+
+ return "no.nibio.vips.logic.messaging.UniversalMessage[ universalMessageId=" + universalMessageId + " ]\n"
+ + (this.getMessageLocalVersionObjects().size() > 0 ?
+ "Subject = " + this.getMessageLocalVersionObjects().get(0).getMsgSubject() + "\n" +
+ "Recipients = " + this.getDistributionList()
+ : "");
}
/**
--
GitLab