Merge pull request #51 from ajordens/master

Add hystrix.properties
spinnaker · Dec 1, 2015 · 34f4964 · 34f4964
2 parents 88e03ed + bf8b600
commit 34f4964
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/Main.groovy b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/Main.groovy
@@ -16,6 +16,7 @@
 
 package com.netflix.spinnaker.igor
 
+import com.netflix.config.ConfigurationManager
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration
 import org.springframework.boot.builder.SpringApplicationBuilder
@@ -40,6 +41,10 @@ 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/igor-web/src/main/resources/hystrix.properties b/igor-web/src/main/resources/hystrix.properties
@@ -0,0 +1,2 @@
+## Hystrix Global Defaults
+hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=60000
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		## Hystrix Global Defaults
		hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=60000