Merge pull request #158 from yahoo/info

#157 domain updates in ZTS should be logged with INFO level
AthenZ · Jun 21, 2017 · 9483e13 · 9483e13
2 parents 6e7202c + c4e0b26
commit 9483e13
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/servers/zts/src/main/java/com/yahoo/athenz/zts/store/DataStore.java b/servers/zts/src/main/java/com/yahoo/athenz/zts/store/DataStore.java
@@ -338,8 +338,8 @@ public boolean processDomain(SignedDomain signedDomain, boolean saveInStore) {
         DomainData domainData = signedDomain.getDomain();
         String domainName = domainData.getName();
 
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Processing domain: {}", domainName);
+        if (LOGGER.isInfoEnabled()) {
+            LOGGER.info("Processing domain: {}", domainName);
         }
 
         /* if the domain is disabled we're going to skip
@@ -473,8 +473,8 @@ boolean processSignedDomains(SignedDomains signedDomains) {
          * from ZMS Server */
 
         if (signedDomains == null) {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug("No updates received from ZMS Server");
+            if (LOGGER.isInfoEnabled()) {
+                LOGGER.info("No updates received from ZMS Server");
             }
             return true;
         }
@@ -483,8 +483,8 @@ boolean processSignedDomains(SignedDomains signedDomains) {
 
         List<SignedDomain> domains = signedDomains.getDomains();
         if (domains == null || domains.isEmpty()) {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug("No updates received from ZMS Server");
+            if (LOGGER.isInfoEnabled()) {
+                LOGGER.info("No updates received from ZMS Server");
             }
             return true;
         }

diff --git a/servers/zts/src/main/java/com/yahoo/athenz/zts/store/impl/S3ChangeLogStore.java b/servers/zts/src/main/java/com/yahoo/athenz/zts/store/impl/S3ChangeLogStore.java
@@ -216,8 +216,8 @@ public SignedDomains getUpdatedSignedDomains(StringBuilder lastModTimeBuffer) {
         ArrayList<String> domains = new ArrayList<>();
         listObjects(s3, domains, lastModTime);
 
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("getUpdatedSignedDomains: {} updated domains", domains.size());
+        if (LOGGER.isInfoEnabled()) {
+            LOGGER.info("getUpdatedSignedDomains: {} updated domains", domains.size());
         }
 
         ArrayList<SignedDomain> signedDomainList = new ArrayList<>();

diff --git a/servers/zts/src/main/java/com/yahoo/athenz/zts/store/impl/ZMSFileChangeLogStore.java b/servers/zts/src/main/java/com/yahoo/athenz/zts/store/impl/ZMSFileChangeLogStore.java
@@ -295,7 +295,7 @@ List<SignedDomain> getSignedDomainList(ZMSClient zmsClient, SignedDomains domain
             final String domainName = domain.getDomain().getName();
 
             if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug("getUpdatedSignedDomains: fetching domain {}", domainName);
+                LOGGER.debug("getSignedDomainList: fetching domain {}", domainName);
             }
 
             try {
@@ -304,7 +304,7 @@ List<SignedDomain> getSignedDomainList(ZMSClient zmsClient, SignedDomains domain
 
                 if (singleDomain == null || singleDomain.getDomains().isEmpty()) {
                     if (LOGGER.isDebugEnabled()) {
-                        LOGGER.debug("getUpdatedSignedDomains: unable to fetch domain {}",
+                        LOGGER.debug("getSignedDomainList: unable to fetch domain {}",
                                 domainName);
                     }
                     continue;
@@ -350,6 +350,10 @@ public SignedDomains getUpdatedSignedDomains(StringBuilder lastModTimeBuffer) {
                 return null;
             }
 
+            if (LOGGER.isInfoEnabled()) {
+                LOGGER.info("getUpdatedSignedDomains: {} updated domains", domainList.getDomains().size());
+            }
+
             List<SignedDomain> domains = getSignedDomainList(zmsClient, domainList);
             return new SignedDomains().setDomains(domains);