Merge pull request #5 from mcanoy/disable

Allow Sonar to start if plugin fails.

.gitignore

@@ -1,6 +1,6 @@
 .DS_Store
 target/
-example/apply.rety
+example/apply.retry
 example/roles
 example/sonar-auth-openshift-plugin-*.jar
 .project

src/main/java/com/rhc/sonarqube/auth/openshift/OpenShiftIdentityProvider.java

@@ -2,6 +2,7 @@
 
 import java.util.HashSet;
 import java.util.Set;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.concurrent.ExecutionException;
 import java.io.File;
@@ -39,6 +40,7 @@ public class OpenShiftIdentityProvider implements OAuth2IdentityProvider {
 
 	public static final String KEY = "openshift";
 	private String todoCallback = "";
+	private boolean initializedOpenshift = true;
 
 	private final OpenShiftScribeApi scribeApi;
 	private final OpenShiftConfiguration config;
@@ -49,28 +51,42 @@ public OpenShiftIdentityProvider(OpenShiftConfiguration config, OpenShiftScribeA
 		this.config = config;
 		this.scribeApi = scribeApi;
 
+		try {
+			if(isEnabled()) {
+				initOpenShift();
+			} else {
+				LOGGER.info("AuthOpenShiftPlugin is disabled");
+			}
+		} catch (Exception ex) {
+			initializedOpenshift = false;
+			LOGGER.severe("AuthOpenShiftPlugin failed to initialize. Disabling...");
+		}
+
+		LOGGER.fine("OpenShift API " + scribeApi.toString());
+	}
+
+	private void initOpenShift() throws Exception {
+
 		try {
 			setKeystore();
 		} catch (Exception ex) {
-			LOGGER.severe("Problem setting up ssl");
-			throw new IllegalStateException("Problem setting up ssl", ex);
+			LOGGER.log(Level.SEVERE, "Problem setting up ssl", ex);
+			throw ex;
 		}
 
 		try {
 			getServiceAccountName();
 		} catch (Exception ex) {
-			LOGGER.severe("Problem getting service account");
-			throw new IllegalStateException("Problem getting service account", ex);
+			LOGGER.log(Level.SEVERE, "Problem getting service account", ex);
+			throw ex;
 		}
 
 		try {
 			todoCallback = this.callbackBaseUrl();
 		} catch (Exception ex) {
-			LOGGER.severe("Problem getting callback url (base on pod's service");
-			throw new IllegalStateException("Problem getting callback url", ex);
+			LOGGER.log(Level.SEVERE, "Problem getting callback url (based on pod's service)", ex);
+			throw ex;
 		}
-
-		LOGGER.fine("OpenShift API " + scribeApi.toString());
 	}
 
 	@Override
@@ -91,7 +107,7 @@ public Display getDisplay() {
 
 	@Override
 	public boolean isEnabled() {
-		return config.isEnabled();
+		return initializedOpenshift && config.isEnabled();
 	}
 
 	@Override
@@ -109,7 +125,7 @@ public void init(InitContext context) {
 			LOGGER.fine("Redirect:" + url);
 			context.redirectTo(url);
 		} catch (IOException e) {
-			LOGGER.severe(String.format("Unable to read/write client id and/or client secret from service account.%n"));
+			LOGGER.severe("Unable to read/write client id and/or client secret from service account.");
 			throw new IllegalStateException("Unable to complete init", e);
 		}
 	}
@@ -185,7 +201,7 @@ private String callbackBaseUrl() throws IOException {
 		OAuth2AccessToken token = new OAuth2AccessToken(config.getClientSecret());
 
 		OAuthRequest request = new OAuthRequest(Verb.GET, config.getRouteURL(config.getNamespace()));
-		LOGGER.info("URL--->" + request.getUrl());
+		LOGGER.info("Route URL: " + request.getUrl());
 		scribe.signRequest(token, request);
 		Response response;
 		try {