Merge pull request #57 from spinnaker/more-hystrix

More hystrix
spinnaker · Dec 8, 2015 · da333d1 · da333d1
2 parents 5c7c53f + a210ef6
commit da333d1
Showing 1 changed file with 6 additions and 25 deletions.
diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/jenkins/service/JenkinsService.groovy b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/jenkins/service/JenkinsService.groovy
@@ -67,10 +67,7 @@ class JenkinsService {
     }
 
     Build getBuild(String jobName, Integer buildNumber) {
-        new SimpleHystrixCommand<Build>(
-            groupKey, "getBuild", {
-            return jenkinsClient.getBuild(jobName, buildNumber)
-        }).execute()
+        return jenkinsClient.getBuild(jobName, buildNumber)
     }
 
     ScmDetails getGitDetails(String jobName, Integer buildNumber) {
@@ -88,38 +85,22 @@ class JenkinsService {
     }
 
     QueuedJob getQueuedItem(Integer item) {
-//        new SimpleHystrixCommand<QueuedJob>(
-//            groupKey, "getQueuedItem", {
-            return jenkinsClient.getQueuedItem(item)
-//        }).execute()
+        return jenkinsClient.getQueuedItem(item)
     }
 
     Response build(String jobName) {
-        new SimpleHystrixCommand<Response>(
-            groupKey, "build", {
-            return jenkinsClient.build(jobName)
-        }).execute()
+        return jenkinsClient.build(jobName)
     }
 
     Response buildWithParameters(String jobName, Map<String, String> queryParams) {
-        new SimpleHystrixCommand<Response>(
-            groupKey, "buildWithParameters", {
-            return jenkinsClient.buildWithParameters(jobName, queryParams)
-        }).execute()
+        return jenkinsClient.buildWithParameters(jobName, queryParams)
     }
 
     JobConfig getJobConfig(String jobName) {
-        new SimpleHystrixCommand<JobConfig>(
-            groupKey, "getJobConfig", {
-            return jenkinsClient.getJobConfig(jobName)
-        }).execute()
+        return jenkinsClient.getJobConfig(jobName)
     }
 
     Response getPropertyFile(String jobName, Integer buildNumber, String fileName) {
-        new SimpleHystrixCommand<Response>(
-            groupKey, "getPropertyFile", {
-            return jenkinsClient.getPropertyFile(jobName, buildNumber, fileName)
-        }).execute()
-
+        return jenkinsClient.getPropertyFile(jobName, buildNumber, fileName)
     }
 }