From 871bda919e4c8de4f60083530af41fa465722d5e Mon Sep 17 00:00:00 2001
From: chenson42 <chenson42@gmail.com>
Date: Sat, 6 Apr 2013 13:18:51 +0000
Subject: [PATCH] update logging

---
 .../jumpmind/symmetric/service/impl/PullService.java |  9 +++++----
 .../jumpmind/symmetric/service/impl/PushService.java | 12 +++++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PullService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PullService.java
index 1e021bb233..54c9b6b3d4 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PullService.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PullService.java
@@ -127,15 +127,16 @@ public void execute(NodeCommunication nodeCommunication, RemoteNodeStatus status
                     
                     dataLoaderService.loadDataFromPull(node, status);
                     
-                    if (status.getDataProcessed() > 0 || status.getBatchesProcessed() > 0) {
+                    if (!status.failed() && 
+                            (status.getDataProcessed() > 0 || status.getBatchesProcessed() > 0)) {
                         log.info(
                                 "Pull data received from {}.  {} rows and {} batches were processed",
                                 new Object[] { node.toString(), status.getDataProcessed(),
                                         status.getBatchesProcessed() });
 
-                    } else {
-                        log.debug(
-                                "Pull data received from {}.  {} rows and {} batches were processed",
+                    } else if (status.failed()) {
+                        log.warn(
+                                "There was a failure while pulling data from {}.  {} rows and {} batches were processed",
                                 new Object[] { node.toString(), status.getDataProcessed(),
                                         status.getBatchesProcessed() });
                     }
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PushService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PushService.java
index 0da003743c..d916d07118 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PushService.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PushService.java
@@ -154,11 +154,17 @@ public void execute(NodeCommunication nodeCommunication, RemoteNodeStatus status
                     reloadBatchesProcessed = status.getReloadBatchesProcessed();
                     log.debug("Push requested for {}", node);
                     pushToNode(node, status);
-                    if (status.getBatchesProcessed() > 0 && status.getBatchesProcessed() != lastBatchCount) {
+                    if (!status.failed() && status.getBatchesProcessed() > 0 
+                            && status.getBatchesProcessed() != lastBatchCount) {
                         log.info(
-                                "Pushed data to {}. {} data and {} batches were processed{}",
+                                "Pushed data to {}. {} data and {} batches were processed",
                                 new Object[] { node, status.getDataProcessed(),
-                                        status.getBatchesProcessed(), status.failed() ? ".  There was at least one failure" : "" });
+                                        status.getBatchesProcessed()});
+                    } else if (status.failed()) {
+                        log.warn(
+                                "There was a failure while pushing data to {}. {} data and {} batches were processed",
+                                new Object[] { node, status.getDataProcessed(),
+                                        status.getBatchesProcessed()});                        
                     }
                     log.debug("Push completed for {}", node);
                     lastBatchCount = status.getBatchesProcessed();