You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/10/18 02:07:56 UTC
[1/2] git commit: change access key logic
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o 31193199e -> 3914d6874
change access key logic
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c27a090f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c27a090f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c27a090f
Branch: refs/heads/two-dot-o
Commit: c27a090fa492093774848412a66307b82c948afc
Parents: c522a93
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Oct 17 18:06:38 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Oct 17 18:06:38 2014 -0600
----------------------------------------------------------------------
.../persistence/queue/impl/SQSQueueManagerImpl.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c27a090f/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java
index 4b86a52..caf5691 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java
@@ -221,7 +221,7 @@ public class SQSQueueManagerImpl implements QueueManager {
@Override
public String getAWSAccessKeyId() {
String accessKey = System.getProperty(SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR);
- if(accessKey == null){
+ if(StringUtils.isEmpty(accessKey)){
accessKey = System.getProperty(SDKGlobalConfiguration.ALTERNATE_ACCESS_KEY_ENV_VAR);
}
return StringUtils.trim(accessKey);
@@ -230,14 +230,17 @@ public class SQSQueueManagerImpl implements QueueManager {
@Override
public String getAWSSecretKey() {
String secret = System.getProperty(SDKGlobalConfiguration.SECRET_KEY_ENV_VAR);
- if(secret==null){
+ if(StringUtils.isEmpty(secret)){
secret = System.getProperty(SDKGlobalConfiguration.ALTERNATE_SECRET_KEY_ENV_VAR);
}
return StringUtils.trim(secret);
}
};
- if(StringUtils.isEmpty(creds.getAWSAccessKeyId()) || StringUtils.isEmpty(creds.getAWSSecretKey()) ){
- throw new AmazonClientException("could not retrieve credentials from system properties");
+ if(StringUtils.isEmpty(creds.getAWSAccessKeyId())){
+ throw new AmazonClientException("could not get aws access key from system properties");
+ }
+ if(StringUtils.isEmpty(creds.getAWSSecretKey())){
+ throw new AmazonClientException("could not get aws secret key from system properties");
}
}
[2/2] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by sf...@apache.org.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3914d687
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3914d687
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3914d687
Branch: refs/heads/two-dot-o
Commit: 3914d6874b29a744051682df3f3768807c9306ee
Parents: c27a090 3119319
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Oct 17 18:07:27 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Oct 17 18:07:27 2014 -0600
----------------------------------------------------------------------
.../src/main/dist/init_instance/create_raid0.sh | 19 +++----
.../dist/init_instance/create_raid0_2disks.sh | 54 --------------------
.../main/dist/init_instance/init_db_server.sh | 2 +-
.../main/dist/init_instance/init_es_server.sh | 2 +-
.../dist/init_instance/init_graphite_server.sh | 4 +-
.../main/dist/init_instance/init_rest_server.sh | 18 +++++--
.../dist/init_instance/install_elasticsearch.sh | 3 ++
.../main/groovy/configure_elasticsearch.groovy | 5 +-
.../src/main/groovy/configure_usergrid.groovy | 13 ++---
stack/awscluster/ugcluster-cf.json | 28 ++++++++--
10 files changed, 64 insertions(+), 84 deletions(-)
----------------------------------------------------------------------