Merge pull request #160 from cfieber/master

Update kork to pick up archaius configuration for hystrix.
spinnaker · Dec 1, 2015 · f95a7bb · f95a7bb
2 parents e623c60 + 350b744
commit f95a7bb
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     maven { url "http://spinnaker.bintray.com/gradle" }
   }
   dependencies {
-    classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:3.4.0'
+    classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:3.5.0'
     classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
   }
 }
@@ -17,7 +17,7 @@ allprojects {
   apply plugin: 'groovy'
 
   spinnaker {
-    dependenciesVersion = "0.19.0"
+    dependenciesVersion = "0.23.0"
   }
 
   configurations.all {

diff --git a/gate-web/config/gate.yml b/gate-web/config/gate.yml
@@ -43,3 +43,13 @@ swagger:
     - .*vpcs.*
     - .*subnets.*
     - .*networks.*
+
+hystrix:
+  command:
+## Hystrix Global Defaults
+    default:
+      execution.isolation.thread.timeoutInMilliseconds: 60000
+## Command-specific overrides
+    fetchGlobalAccounts:
+      execution.isolation.thread.timeoutInMilliseconds: 2000
+
diff --git a/gate-web/config/hystrix.properties b/gate-web/config/hystrix.properties
diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/Main.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/Main.groovy
@@ -16,7 +16,6 @@
 
 package com.netflix.spinnaker.gate
 
-import com.netflix.config.ConfigurationManager
 import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsStreamServlet
 import com.netflix.spinnaker.hystrix.spectator.HystrixSpectatorConfig
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
@@ -49,10 +48,6 @@ class Main extends SpringBootServletInitializer {
           'spring.profiles.active': '${netflix.environment},local'
   ]
 
-  static {
-    ConfigurationManager.loadCascadedPropertiesFromResources("hystrix")
-  }
-
   static void main(String... args) {
     new SpringApplicationBuilder().properties(DEFAULT_PROPS).sources(Main).run(args)
   }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip