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 06:30:46 UTC
stratos git commit: Removing printStackTrace() statements and
replacing them with log.error()
Repository: stratos
Updated Branches:
refs/heads/master fa0f72346 -> e226e33ea
Removing printStackTrace() statements and replacing them with log.error()
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e226e33e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e226e33e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e226e33e
Branch: refs/heads/master
Commit: e226e33ea058f81aecadc1a2e1e3477b423453a6
Parents: fa0f723
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Jan 11 11:00:36 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Jan 11 11:00:36 2015 +0530
----------------------------------------------------------------------
.../parser/DefaultApplicationParser.java | 22 +++++++++++++-------
.../client/CloudControllerClient.java | 1 -
.../component/ParentComponentMonitor.java | 9 +++++---
.../services/impl/AutoScalerServiceImpl.java | 1 -
.../commands/AddAutoscalingPolicyCommand.java | 1 -
.../cli/commands/AddCartridgeCommand.java | 1 -
.../iaases/openstack/OpenstackIaas.java | 3 +--
.../apache/stratos/common/util/CommonUtil.java | 3 ++-
.../metadata/client/rest/DefaultRestClient.java | 3 ++-
.../metadataservice/handlers/OAuthHandler.java | 3 ++-
10 files changed, 28 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e226e33e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
index 3948f08..60e94aa 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
@@ -693,9 +693,9 @@ public class DefaultApplicationParser implements ApplicationParser {
return new ApplicationClusterContext(cartridgeInfo.getType(), clusterId, hostname, textPayload, deploymentPolicy, isLB);
}
- public String createToken(String appid) throws AutoScalerException {
+ public String createToken(String applicationId) throws AutoScalerException {
String token = null;
- String ouathAppName = appid + Math.random();
+ String ouathAppName = applicationId + Math.random();
String serviceProviderName = ouathAppName;
try {
@@ -705,16 +705,24 @@ public class DefaultApplicationParser implements ApplicationParser {
} catch (OAuthAdminServiceException e) {
throw new AutoScalerException(e);
}
+
+ String errorMessage = String.format("Could not create oauth token: [application-id] %s", applicationId);
+
try {
- token = IdentityApplicationManagementServiceClient.getServiceClient().createServiceProvider(ouathAppName, serviceProviderName, appid);
+ token = IdentityApplicationManagementServiceClient.getServiceClient().createServiceProvider(ouathAppName,
+ serviceProviderName, applicationId);
} catch (RemoteException e) {
- throw new AutoScalerException(e);
+ log.error(errorMessage, e);
+ throw new AutoScalerException(errorMessage, e);
} catch (OAuthAdminServiceException e) {
- e.printStackTrace();
+ log.error(errorMessage, e);
+ throw new AutoScalerException(errorMessage, e);
} catch (OAuthProblemException e) {
- throw new AutoScalerException(e);
+ log.error(errorMessage, e);
+ throw new AutoScalerException(errorMessage, e);
} catch (OAuthSystemException e) {
- throw new AutoScalerException(e);
+ log.error(errorMessage, e);
+ throw new AutoScalerException(errorMessage, e);
}
return token;
http://git-wip-us.apache.org/repos/asf/stratos/blob/e226e33e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
index 21e29b7..1457b94 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
@@ -278,7 +278,6 @@ public class CloudControllerClient {
log.error(msg, e);
//throw new TerminationException(msg, e);
} catch (CloudControllerServiceApplicationClusterRegistrationExceptionException e) {
- //e.printStackTrace();
String msg = e.getMessage();
log.error(msg, e);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e226e33e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
index f2ed320..82bb67a 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
@@ -458,15 +458,18 @@ public abstract class ParentComponentMonitor extends Monitor implements Runnable
if ((terminationList.isEmpty() || allDependentTerminated) &&
(parentContexts.isEmpty() || parentsTerminated || allParentsActive)) {
//Find the non existent monitor by traversing dependency tree
+
+ String errorMessage = String.format("Could not start dependency on termination: [instance-id] %s", instanceId);
+
try {
try {
this.startDependencyOnTermination(instanceId);
} catch (MonitorNotFoundException e) {
- e.printStackTrace();
+ log.error(errorMessage, e);
} catch (PolicyValidationException e) {
- e.printStackTrace();
+ log.error(errorMessage, e);
} catch (PartitionValidationException e) {
- e.printStackTrace();
+ log.error(errorMessage, e);
}
} catch (TopologyInConsistentException e) {
//TODO revert the siblings and notify parent, change a flag for reverting/un-subscription
http://git-wip-us.apache.org/repos/asf/stratos/blob/e226e33e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoScalerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoScalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoScalerServiceImpl.java
index 5aa4abe..35f6b32 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoScalerServiceImpl.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoScalerServiceImpl.java
@@ -437,7 +437,6 @@ public class AutoScalerServiceImpl implements AutoScalerService {
log.error(String.format("Error ocured while deleting oAuth application %s", applicationId), e);
throw new AutoScalerException(e);
} catch (IdentityApplicationManagementServiceIdentityApplicationManagementException e) {
- e.printStackTrace();
}
*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/e226e33e/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddAutoscalingPolicyCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddAutoscalingPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddAutoscalingPolicyCommand.java
index 019d047..51c7769 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddAutoscalingPolicyCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddAutoscalingPolicyCommand.java
@@ -105,7 +105,6 @@ public class AddAutoscalingPolicyCommand implements Command<StratosCommandContex
System.out.println(e.getMessage());
return CliConstants.COMMAND_FAILED;
} catch (IOException e) {
- //e.printStackTrace();
System.out.println("Invalid resource path");
return CliConstants.COMMAND_FAILED;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e226e33e/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddCartridgeCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddCartridgeCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddCartridgeCommand.java
index 1367fef..dcb8846 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddCartridgeCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddCartridgeCommand.java
@@ -105,7 +105,6 @@ public class AddCartridgeCommand implements Command<StratosCommandContext> {
System.out.println(e.getMessage());
return CliConstants.COMMAND_FAILED;
} catch (IOException e) {
- //e.printStackTrace();
System.out.println("Invalid resource path");
return CliConstants.COMMAND_FAILED;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e226e33e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/OpenstackIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/OpenstackIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/OpenstackIaas.java
index 34daf2a..c3dbba8 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/OpenstackIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/OpenstackIaas.java
@@ -484,8 +484,7 @@ public class OpenstackIaas extends JcloudsIaas {
try {
// waiting 5seconds till volumes are actually attached.
Thread.sleep(5000);
- } catch (InterruptedException e) {
- e.printStackTrace();
+ } catch (InterruptedException ignore) {
}
if (attachment == null) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/e226e33e/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CommonUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CommonUtil.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CommonUtil.java
index c0f810f..436eb2a 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CommonUtil.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CommonUtil.java
@@ -642,7 +642,8 @@ public class CommonUtil {
byte[] cipherText = cipher.doFinal(repoUserPassword.getBytes());
encryptPassword = new String(coder.encode(cipherText));
} catch (Exception e) {
- e.printStackTrace();
+ String message = "Could not encrypt password";
+ log.error(message, e);
}
return encryptPassword;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e226e33e/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java b/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java
index d3a3f7f..68f4163 100644
--- a/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java
+++ b/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java
@@ -163,7 +163,8 @@ public class DefaultRestClient implements RestClient {
stringEntity = new StringEntity(payloadText);
stringEntity.setContentType(APPLICATION_JSON);
} catch (UnsupportedEncodingException e) {
- e.printStackTrace();
+ String message = String.format("Could not add string to payload: [payload] %s", payloadText);
+ log.error(message, e);
}
post.setEntity(stringEntity);
http://git-wip-us.apache.org/repos/asf/stratos/blob/e226e33e/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/handlers/OAuthHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/handlers/OAuthHandler.java b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/handlers/OAuthHandler.java
index 39ab236..e265e7e 100644
--- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/handlers/OAuthHandler.java
+++ b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/handlers/OAuthHandler.java
@@ -125,7 +125,8 @@ public class OAuthHandler extends AbstractAuthenticationAuthorizationHandler {
}
} catch (Exception e) {
- e.printStackTrace();
+ String message = "Could not extract application id from id token";
+ log.error(message, e);
}
return appId;
}