From c58694b967606e80f1e493bff8ab6c794ddbc7a6 Mon Sep 17 00:00:00 2001 From: tomaslin Date: Tue, 8 Dec 2015 12:08:46 -0800 Subject: [PATCH 1/3] remove more commands from being hystrixed --- .../jenkins/service/JenkinsService.groovy | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 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 index aa597276b..e55c855a4 100644 --- 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 @@ -88,31 +88,19 @@ class JenkinsService { } QueuedJob getQueuedItem(Integer item) { -// new SimpleHystrixCommand( -// groupKey, "getQueuedItem", { - return jenkinsClient.getQueuedItem(item) -// }).execute() + return jenkinsClient.getQueuedItem(item) } Response build(String jobName) { - new SimpleHystrixCommand( - groupKey, "build", { - return jenkinsClient.build(jobName) - }).execute() + return jenkinsClient.build(jobName) } Response buildWithParameters(String jobName, Map queryParams) { - new SimpleHystrixCommand( - groupKey, "buildWithParameters", { - return jenkinsClient.buildWithParameters(jobName, queryParams) - }).execute() + return jenkinsClient.buildWithParameters(jobName, queryParams) } JobConfig getJobConfig(String jobName) { - new SimpleHystrixCommand( - groupKey, "getJobConfig", { - return jenkinsClient.getJobConfig(jobName) - }).execute() + return jenkinsClient.getJobConfig(jobName) } Response getPropertyFile(String jobName, Integer buildNumber, String fileName) { From 39f9285d3dcf53aef0af1a7292f0fc5617b4d6e7 Mon Sep 17 00:00:00 2001 From: tomaslin Date: Tue, 8 Dec 2015 13:06:00 -0800 Subject: [PATCH 2/3] none of the hystrix fallbacks seem to work --- .../igor/jenkins/service/JenkinsService.groovy | 11 ++--------- 1 file changed, 2 insertions(+), 9 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 index e55c855a4..e78833546 100644 --- 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( - groupKey, "getBuild", { - return jenkinsClient.getBuild(jobName, buildNumber) - }).execute() + return jenkinsClient.getBuild(jobName, buildNumber) } ScmDetails getGitDetails(String jobName, Integer buildNumber) { @@ -104,10 +101,6 @@ class JenkinsService { } Response getPropertyFile(String jobName, Integer buildNumber, String fileName) { - new SimpleHystrixCommand( - groupKey, "getPropertyFile", { - return jenkinsClient.getPropertyFile(jobName, buildNumber, fileName) - }).execute() - + return jenkinsClient.getPropertyFile(jobName, buildNumber, fileName)emove } } From a210ef672cc4cb6db0c9c41e328de33d677af7f0 Mon Sep 17 00:00:00 2001 From: tomaslin Date: Tue, 8 Dec 2015 13:06:00 -0800 Subject: [PATCH 3/3] none of the hystrix fallbacks seem to work --- .../spinnaker/igor/jenkins/service/JenkinsService.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index e78833546..3d6756214 100644 --- 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 @@ -101,6 +101,6 @@ class JenkinsService { } Response getPropertyFile(String jobName, Integer buildNumber, String fileName) { - return jenkinsClient.getPropertyFile(jobName, buildNumber, fileName)emove + return jenkinsClient.getPropertyFile(jobName, buildNumber, fileName) } }