You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/01/11 08:21:05 UTC
[2/2] stratos git commit: Removing printStackTrace() statements in
java cartridge agent
Removing printStackTrace() statements in java cartridge agent
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7f148b9d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7f148b9d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7f148b9d
Branch: refs/heads/master
Commit: 7f148b9d5f4437977a2869a0567dba3816293a0d
Parents: eb4110b
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Jan 11 12:37:49 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Jan 11 12:50:54 2015 +0530
----------------------------------------------------------------------
.../git/impl/GitBasedArtifactRepository.java | 12 ++++--------
.../deployment/synchronizer/git/util/Utilities.java | 1 -
.../agent/data/publisher/log/LogPublisherManager.java | 2 +-
.../cartridge/agent/util/CartridgeAgentUtils.java | 3 +--
4 files changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f148b9d/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java
index 839a34b..fec47a6 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java
@@ -125,7 +125,7 @@ public class GitBasedArtifactRepository {
localRepo = new FileRepository(new File(gitRepoCtx.getGitLocalRepoPath() + "/.git"));
} catch (IOException e) {
- e.printStackTrace();
+ log.error(e);
}
gitRepoCtx.setLocalRepo(localRepo);
@@ -690,7 +690,6 @@ public class GitBasedArtifactRepository {
} catch (TransportException e) {
log.error("Accessing remote git repository " + gitRepoCtx.getGitRemoteRepoUrl() + " failed for tenant " + gitRepoCtx.getTenantId(), e);
- e.printStackTrace();
return false;
} catch (CheckoutConflictException e) { //TODO: handle conflict efficiently. Currently the whole directory is deleted and re-cloned
@@ -703,7 +702,6 @@ public class GitBasedArtifactRepository {
} catch (GitAPIException e) {
log.error("Git pull operation for tenant " + gitRepoCtx.getTenantId() + " failed", e);
- e.printStackTrace();
return false;
}
return true;
@@ -796,9 +794,9 @@ public class GitBasedArtifactRepository {
// storedConfig.load();
} catch (IOException e) {
- log.error("Error saving git configuration file in local repo at " + gitRepoCtx.getGitLocalRepoPath(), e);
- e.printStackTrace();
-
+ String message = "Error saving git configuration file in local repo at " + gitRepoCtx.getGitLocalRepoPath();
+ System.out.println(message);
+ log.error(message, e);
}
}
}
@@ -842,11 +840,9 @@ public class GitBasedArtifactRepository {
} catch (TransportException e) {
log.error("Accessing remote git repository failed for tenant " + gitRepoCtx.getTenantId(), e);
- e.printStackTrace();
} catch (GitAPIException e) {
log.error("Git clone operation for tenant " + gitRepoCtx.getTenantId() + " failed", e);
- e.printStackTrace();
}
}*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f148b9d/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/util/Utilities.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/util/Utilities.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/util/Utilities.java
index 6d9bec6..fd50b5b 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/util/Utilities.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/util/Utilities.java
@@ -70,7 +70,6 @@ public class Utilities {
} catch (IOException e) {
log.error("Deletion of existing non-git repository structure failed");
- e.printStackTrace();
}
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f148b9d/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/LogPublisherManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/LogPublisherManager.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/LogPublisherManager.java
index 5ca3c89..8931463 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/LogPublisherManager.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/LogPublisherManager.java
@@ -131,7 +131,7 @@ public class LogPublisherManager {
try {
alias = clusterId.split("\\.")[0];
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e);
alias = clusterId;
}
return alias;
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f148b9d/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentUtils.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentUtils.java
index 010462d..978ae5f 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentUtils.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentUtils.java
@@ -71,8 +71,7 @@ public class CartridgeAgentUtils {
byte[] decrypted = cipher.doFinal(encrypted);
decryptPassword = new String(decrypted);
} catch (Exception e) {
- log.error("Exception has occurred. " + e.getMessage());
- e.printStackTrace();
+ log.error("An error has occurred", e);
}
if (log.isDebugEnabled()) {
log.debug("Decrypted PWD : [" + decryptPassword + "] ");