From bf8b600d9f3c44012390c9899778696046405e32 Mon Sep 17 00:00:00 2001
From: Adam Jordens <ajordens@netflix.com>
Date: Mon, 30 Nov 2015 17:50:17 -0800
Subject: [PATCH] Add hystrix.properties

- This is a placeholder, hystrix configuration will get folded into the Spring environment shortly
---
 .../src/main/groovy/com/netflix/spinnaker/igor/Main.groovy   | 5 +++++
 igor-web/src/main/resources/hystrix.properties               | 2 ++
 2 files changed, 7 insertions(+)
 create mode 100644 igor-web/src/main/resources/hystrix.properties

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
index 409251f21..8b465615b 100644
--- 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
new file mode 100644
index 000000000..e4a2c8bfd
--- /dev/null
+++ b/igor-web/src/main/resources/hystrix.properties
@@ -0,0 +1,2 @@
+## Hystrix Global Defaults
+hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=60000