[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rhq-commits
Subject:    [rhq] Branch 'jay-avail' - modules/core
From:       mazz <mazz () fedoraproject ! org>
Date:       2013-11-26 20:15:04
Message-ID: 20131126201504.5A36761BBF () fedorahosted ! org
[Download RAW message or body]

 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityProxy.java \
|   18 ++++------  1 file changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 61bf3197f0d32f2c53e855eb074da662b2e23d1c
Author: John Mazzitelli <mazz@redhat.com>
Date:   Tue Nov 26 15:15:00 2013 -0500

    fix logging so its not too noisy

diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityProxy.java \
b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityProxy.java
 index 9fada2c..40edfa7 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityProxy.java
                
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityProxy.java
 @@ -177,9 +177,10 @@ public class AvailabilityProxy implements AvailabilityFacet, \
                Callable<Availabili
             } else if (availAsyncConsecutiveTimeouts == AVAIL_SYNC_TIMEOUT_LIMIT) {
                 // log one time that we are disabling synchronous checks for this \
resource  ++availAsyncConsecutiveTimeouts;
-                // TODO:  SHOULD THIS BE DEBUG? (must be same as enable message \
                above)
-                log.info("Disabling synchronous availability collection for " + \
                resourceComponent + "; ["
-                    + AVAIL_SYNC_TIMEOUT_LIMIT + "] consective timeouts exceeding [" \
+ AVAIL_SYNC_TIMEOUT + "ms]"); +                if (log.isDebugEnabled()) {
+                    log.debug("Disabling synchronous availability collection for [" \
+ resourceComponent + "]; [" +                        + AVAIL_SYNC_TIMEOUT_LIMIT + "] \
consective timeouts exceeding [" + AVAIL_SYNC_TIMEOUT + "ms]"); +                }
             }
         } catch (InterruptedException e) {
             log.debug("InterruptedException; shut down is (likely) in progress.");
@@ -194,9 +195,6 @@ public class AvailabilityProxy implements AvailabilityFacet, \
Callable<Availabili  } catch (java.util.concurrent.TimeoutException e) {
             // failed to get avail synchronously. next call to the future will \
return availability (we hope)  ++availAsyncConsecutiveTimeouts;
-
-            // TODO: REMOVE THIS DEV LOGGING!!
-            log.warn("AVAIL CHECK TIMEOUT! " + resourceComponent);
         }
 
         return processAvail(avail);
@@ -221,11 +219,11 @@ public class AvailabilityProxy implements AvailabilityFacet, \
                Callable<Availabili
         // resource comes up we should give it a chance to respond quickly and \
provide live avail.  if (result != last) {
             if (result == UP) {
-
-                // TODO:  SHOULD THIS BE DEBUG? (must be same as disable message \
                above)
                 if (availAsyncConsecutiveTimeouts >= AVAIL_SYNC_TIMEOUT_LIMIT) {
-                    log.info("Enabling synchronous availability collection for " + \
                resourceComponent
-                        + "; Availability has just changed from [" + last.name() + \
"] to UP."); +                    if (log.isDebugEnabled()) {
+                        log.debug("Enabling synchronous availability collection for \
[" + resourceComponent +                            + "]; Availability has just \
changed from [" + last + "] to UP."); +                    }
                 }
                 availAsyncConsecutiveTimeouts = 0;
 


_______________________________________________
rhq-commits mailing list
rhq-commits@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/rhq-commits


[prev in list] [next in list] [prev in thread] [next in thread]