usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [1/2] usergrid git commit: Revert "Adding distinctive logging, also: no longer wrap RuntimeException in RuntimeException"
Date Tue, 24 May 2016 18:37:45 GMT
Repository: usergrid
Updated Branches:
  refs/heads/release-2.1.1 aae8fdf81 -> 0970e1dfa


Revert "Adding distinctive logging, also: no longer wrap RuntimeException in RuntimeException"

This reverts commit 6b195a07b94858deecdc80156d9ab9ebd6ae4a80.


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

Branch: refs/heads/release-2.1.1
Commit: b03f6a9eaee9cd529ff8ca781030415798f32e7d
Parents: aae8fdf
Author: Dave Johnson <snoopdave@apache.org>
Authored: Tue May 24 14:36:29 2016 -0400
Committer: Dave Johnson <snoopdave@apache.org>
Committed: Tue May 24 14:36:29 2016 -0400

----------------------------------------------------------------------
 .../org/apache/usergrid/services/ServiceManager.java   | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/b03f6a9e/stack/services/src/main/java/org/apache/usergrid/services/ServiceManager.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/ServiceManager.java
b/stack/services/src/main/java/org/apache/usergrid/services/ServiceManager.java
index ef1baaf..1ed73d6 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/ServiceManager.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/ServiceManager.java
@@ -128,27 +128,18 @@ public class ServiceManager {
                     if ( application != null ) {
                         appNotFound = false;
                         applicationId = application.getUuid();
-
                     } else {
-                        // Cassandra may be alive but responding very slowly, let's wait
and retry
-                        logger.error("STARTUP PROBLEM: Cannot get application by UUID. Will
retry in {} seconds #{}",
-                            retryInterval/1000, retryCount);
                         Thread.sleep( retryInterval );
                         retryCount++;
                     }
                 }
 
                 if ( application == null ) {
-                    Exception e = new RuntimeException(
-                        "STARTUP FAILURE: application id {" + em.getApplicationId()
-                            + "} is returning null after " + retryCount + " retries" );
+                    Exception e = new RuntimeException( "application id {" + em.getApplicationId()
+ "} is returning null" );
+                    logger.error( "Failed to get application", e );
                     throw e;
                 }
 
-            } catch ( RuntimeException re ) {
-                logger.error( "ServiceManager init failure", re );
-                throw re;
-
             } catch ( Exception e ) {
                 logger.error( "ServiceManager init failure", e );
                 throw new RuntimeException( e );


Mime
View raw message