Removed exception loggin in EIDSInputWedge. Added to parallelSendProd…

…ucts
usgs · May 4, 2021 · 078deda · 078deda
1 parent f6ce6c7
commit 078deda
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/src/main/java/gov/usgs/earthquake/distribution/ProductBuilder.java b/src/main/java/gov/usgs/earthquake/distribution/ProductBuilder.java
@@ -295,7 +295,12 @@ public static Map<ProductSender, Exception> parallelSendProduct(final List<Produ
 					sender.sendProduct(product);
 					sendComplete.put(sender, true);
 				} catch (Exception e) {
-					sendExceptions.put(sender, e);
+					if (e instanceof ProductAlreadyInStorageException) {
+						LOGGER.info("Product already in storage, id=" + product.getId().toString());
+					} else {
+						LOGGER.log(Level.WARNING, "[" + sender.getName() + "] error sending product", e);
+						sendExceptions.put(sender, e);
+					}
 				}
 				return null;
 			});

diff --git a/src/main/java/gov/usgs/earthquake/eids/EIDSInputWedge.java b/src/main/java/gov/usgs/earthquake/eids/EIDSInputWedge.java
@@ -740,15 +740,6 @@ else if (poll) {
 						totalFailures++;
 						LOGGER.severe("Total failure sending product "
 								+ sentId.toString());
-
-						//Iterator for specific Product Senders
-						Iterator<ProductSender> productSenders = sendExceptions.get(sentId)
-								.keySet().iterator();
-						while(productSenders.hasNext()) {
-							ProductSender productSender = productSenders.next();
-								LOGGER.fine("Total failure exception "
-									+ sendExceptions.get(sentId).get(productSender).toString());
-						}
 					} else {
 						// output built product id because it was sent at least
 						// once
@@ -760,14 +751,6 @@ else if (poll) {
 							partialFailures++;
 							LOGGER.warning("Partial failure sending product "
 									+ sentId.toString());
-
-							Iterator<ProductSender> productSenders = sendExceptions.get(sentId)
-									.keySet().iterator();
-							while(productSenders.hasNext()) {
-								ProductSender productSender = productSenders.next();
-									LOGGER.fine("Total failure exception "
-										+ sendExceptions.get(sentId).get(productSender).toString());
-							}
 						}
 					}
 				}