xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Omaha #4562 : Update AutoFaxManager to log messages for each fax" into omaha_16.2.2

Browse source 
Former-commit-id: c64f5dea99d0fd5a707dc149d946d40c457649b9
This commit is contained in:
Richard Peter 2016-01-26 09:12:51 -06:00 • committed by Gerrit Code Review
commit a95a22995f
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/res/spring/text-subscription-ingest.xml
View file

@ -12,7 +12,7 @@
<property name="type" value="timer" />
</bean>
<camelContext id="clustered-text-subscription-camel"
<camelContext id="text-subscription-camel"
xmlns="http://camel.apache.org/schema/spring"
errorHandlerRef="errorHandler">

42
edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/AutoFaxManager.java
View file

@ -71,26 +71,22 @@ public class AutoFaxManager {
}
}
public void processEvent(Object event) throws EdexException {
public void processEvent(PluginDataObject[] pdos) throws EdexException {
List<String> trigger = new ArrayList<String>();
if (event instanceof PluginDataObject[]) {
PluginDataObject[] pdos = (PluginDataObject[]) event;
for (PluginDataObject pdo : pdos) {
try {
if (pdo instanceof TextRecord) {
TextRecord tr = (TextRecord) pdo;
String prodID = tr.getProductId();
if (logger.isDebugEnabled()) {
logger.debug("Processing trigger: " + prodID
+ ", class = "
+ pdo.getClass().getSimpleName());
}
trigger.add(prodID);
for (PluginDataObject pdo : pdos) {
try {
if (pdo instanceof TextRecord) {
TextRecord tr = (TextRecord) pdo;
String prodID = tr.getProductId();
if (logger.isDebugEnabled()) {
logger.debug("Processing trigger: " + prodID
+ ", class = " + pdo.getClass().getSimpleName());
}
} catch (Exception e) {
logger.warn("Unable to extract product information from ["
+ pdo.toString() + "] skipping...");
trigger.add(prodID);
}
} catch (Exception e) {
logger.warn("Unable to extract product information from ["
+ pdo.toString() + "] skipping...");
}
}
sendFaxes(trigger);
@ -113,10 +109,14 @@ public class AutoFaxManager {
// Shove it out to all the autofax subscribers to this
// PIL.
try {
FaxSender.sendFax(faxRecord.getCompany(), faxRecord
.getId().getFaxNumber(), faxRecord
.getRecipient(), faxText, faxRecord.getId()
.getAfosPil());
logger.info("Sending fax to '"
+ faxRecord.getCompany()
+ "' for AFOS PIL: " + afosPil);
String status = FaxSender.sendFax(faxRecord
.getCompany(), faxRecord.getId()
.getFaxNumber(), faxRecord.getRecipient(),
faxText, faxRecord.getId().getAfosPil());
logger.info(status);
} catch (IOException e) {
logger.warn("Error sending fax for AFOS PIL: "
+ afosPil);