catched exception for build log retrieve

nubomedia · Apr 21, 2016 · 19d5e1a · 19d5e1a
1 parent f25fded
commit 19d5e1a
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/main/java/org/project/openbaton/nubomedia/api/openshift/beans/BuildStatusManager.java b/src/main/java/org/project/openbaton/nubomedia/api/openshift/beans/BuildStatusManager.java
@@ -11,6 +11,8 @@
 import org.springframework.context.annotation.Scope;
 import org.springframework.http.*;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpServerErrorException;
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.PostConstruct;
@@ -93,7 +95,15 @@ public String retrieveLogs(String baseURL, String appName, String namespace, Htt
         Build target = this.retrieveBuild(baseURL,appName,namespace,authHeader);
         String URL = baseURL + namespace + suffix + target.getMetadata().getName() + logSuffix;
         HttpEntity<String> logEntity = new HttpEntity<>(authHeader);
-        ResponseEntity<String> res = template.exchange(URL,HttpMethod.GET,logEntity,String.class);
+        ResponseEntity<String> res = null;
+
+        try {
+            res = template.exchange(URL, HttpMethod.GET, logEntity, String.class);
+        } catch (HttpServerErrorException e){
+            return "Build logs not anymore available";
+        } catch (HttpClientErrorException e){
+            return "Problems on communication with PaaS";
+        }
 
         if(res.getStatusCode() != HttpStatus.OK){
             logger.debug("Error retrieving logs " + res.getStatusCode() + " response " + res.toString());