You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/09/16 12:58:46 UTC

[2/3] git commit: remove unnecssary logs

remove unnecssary logs


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3463763a
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3463763a
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3463763a

Branch: refs/heads/4.0.0-grouping
Commit: 3463763a4a185e81d5104ccacb86cdac4825eadd
Parents: ecc7d98
Author: gayan <ga...@puppet.gayan.org>
Authored: Tue Sep 16 16:19:03 2014 +0530
Committer: gayan <ga...@puppet.gayan.org>
Committed: Tue Sep 16 16:19:03 2014 +0530

----------------------------------------------------------------------
 .../metadataservice/listener/TopologyAgent.java |  4 ++-
 .../listener/TopologyListener.java              |  6 +++--
 .../registry/CarbonRegistry.java                | 28 +++++++++-----------
 .../metadataservice/registry/GRegRegistry.java  | 26 +++++++++---------
 4 files changed, 34 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/3463763a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyAgent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyAgent.java b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyAgent.java
index b8fe918..8e39364 100644
--- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyAgent.java
+++ b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyAgent.java
@@ -67,8 +67,10 @@ public class TopologyAgent implements Runnable {
 						log.debug("Member terminated event received");
 					}
 					MemberTerminatedEvent memberTerminatedEvent = (MemberTerminatedEvent) event;
-					System.out.println("Terminated event :::::::::::::::::::: " +
+					if(log.isDebugEnabled()){
+						log.debug("Terminated event :::::::::::::::::::: " +
 					                   memberTerminatedEvent.getServiceName());
+					}
 					new MetaDataAdmin().removeCartridgeMetaDataDetails("appA", "php");
 
 				} catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/stratos/blob/3463763a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyListener.java b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyListener.java
index 2f09d3d..fbca388 100644
--- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyListener.java
+++ b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyListener.java
@@ -59,8 +59,10 @@ public class TopologyListener implements ServletContextListener {
 						log.debug("Member terminated event received");
 					}
 					MemberTerminatedEvent memberTerminatedEvent = (MemberTerminatedEvent) event;
-					System.out.println("Terminated event :::::::::::::::::::: " +
-					                   memberTerminatedEvent.getServiceName());
+					if(log.isDebugEnabled()){
+    					log.info("Terminated event :::::::::::::::::::: " +
+    					                   memberTerminatedEvent.getServiceName());
+					}
 					new MetaDataAdmin().removeCartridgeMetaDataDetails("appA", "php");
 
 					// extensionHandler.onMemberTerminatedEvent(memberTerminatedEvent);

http://git-wip-us.apache.org/repos/asf/stratos/blob/3463763a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
index 7d5acd0..054db31 100644
--- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
+++ b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
@@ -67,7 +67,7 @@ public class CarbonRegistry extends AbstractAdmin implements DataStore {
 	@Override
 	public String addCartridgeMetaDataDetails(String applicationName, String cartridgeType,
 	                                          CartridgeMetaData cartridgeMetaData) throws Exception {
-		System.out.println("Adding meta data details");
+		
 
 		Registry tempRegistry = getGovernanceUserRegistry();
 		try {
@@ -96,24 +96,24 @@ public class CarbonRegistry extends AbstractAdmin implements DataStore {
 
 			tempRegistry.put(resourcePath, resource);
 
-			System.out.println("A resource added to: " + resourcePath);
-
-			System.out.println(cartridgeMetaData.type);
-			// registry.rateResource(resourcePath, defaultRank);
+			if(log.isDebugEnabled()){
+				log.debug("A resource added to: " + resourcePath);
+			}
 
+		
 			Comment comment = new Comment();
 			comment.setText("Added the " + applicationName + " " + type + " cartridge");
 			// registry.addComment(resourcePath, comment);
 
 		} catch (Exception e) {
-
-			System.out.println(e.getMessage());
-			e.printStackTrace();
+			if (log.isErrorEnabled()) {
+				log.error("addCartridgeMetaDataDetails", e);
+			}
 		} finally {
 			// Close the session
 
 		}
-		System.out.println("Add meta data details");
+		
 		return "success";
 	}
 
@@ -134,10 +134,7 @@ public class CarbonRegistry extends AbstractAdmin implements DataStore {
 			if (registry.resourceExists(resourcePath)) {
 
 				Resource getResource = registry.get(resourcePath);
-				System.out.println("Resource retrived");
-				System.out.println("Printing retrieved resource content: " +
-				                   new String((byte[]) getResource.getContent()));
-
+			
 				cartridgeMetaData.type = getResource.getProperty("Cartidge Type");
 				cartridgeMetaData.applicationName = getResource.getProperty("Application Name");
 				cartridgeMetaData.description = getResource.getProperty("Description");
@@ -159,8 +156,9 @@ public class CarbonRegistry extends AbstractAdmin implements DataStore {
 
 		} catch (Exception e) {
 
-			System.out.println(e.getMessage());
-			e.printStackTrace();
+			if (log.isErrorEnabled()) {
+				log.error("getCartridgeMetaDataDetails", e);
+			}
 		} finally {
 			// Close the session
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/3463763a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/GRegRegistry.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/GRegRegistry.java b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/GRegRegistry.java
index 080fc60..2d655c9 100644
--- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/GRegRegistry.java
+++ b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/GRegRegistry.java
@@ -101,7 +101,7 @@ public class GRegRegistry implements DataStore {
 	@Override
 	public String addCartridgeMetaDataDetails(String applicationName, String cartridgeType,
 	                                          CartridgeMetaData cartridgeMetaData) throws Exception {
-		System.out.println("Adding meta data details");
+	
 		Registry registry = setRegistry();
 		try {
 
@@ -129,9 +129,7 @@ public class GRegRegistry implements DataStore {
 
 			registry.put(resourcePath, resource);
 
-			System.out.println("A resource added to: " + resourcePath);
-
-			System.out.println(cartridgeMetaData.type);
+				
 			registry.rateResource(resourcePath, defaultRank);
 
 			Comment comment = new Comment();
@@ -140,13 +138,14 @@ public class GRegRegistry implements DataStore {
 
 		} catch (Exception e) {
 
-			System.out.println(e.getMessage());
-			e.printStackTrace();
+			if (log.isErrorEnabled()) {
+				log.error("addCartridgeMetaDataDetails", e);
+			}
 		} finally {
 			// Close the session
 			((WSRegistryServiceClient) registry).logut();
 		}
-		System.out.println("Add meta data details");
+	
 		return "success";
 	}
 
@@ -167,9 +166,11 @@ public class GRegRegistry implements DataStore {
 			if (registry.resourceExists(resourcePath)) {
 
 				Resource getResource = registry.get(resourcePath);
-				System.out.println("Resource retrived");
-				System.out.println("Printing retrieved resource content: " +
-				                   new String((byte[]) getResource.getContent()));
+				if(log.isDebugEnabled()){
+    				log.debug("Resource retrived");
+    				log.debug("Printing retrieved resource content: " +
+    				                   new String((byte[]) getResource.getContent()));
+				}
 
 				cartridgeMetaData.type = getResource.getProperty("Cartidge Type");
 				cartridgeMetaData.applicationName = getResource.getProperty("Application Name");
@@ -192,8 +193,9 @@ public class GRegRegistry implements DataStore {
 
 		} catch (Exception e) {
 
-			System.out.println(e.getMessage());
-			e.printStackTrace();
+			if (log.isErrorEnabled()) {
+				log.error("getCartridgeMetaDataDetails", e);
+			}
 		} finally {
 			// Close the session
 			((WSRegistryServiceClient) registry).logut();