Skip to content

Commit

Permalink
fix(core/cache): Allow clouddriver to be started without redis by mak…
Browse files Browse the repository at this point in the history
…ing CoreProvider conditionally constructed. (#1597)
  • Loading branch information
Matt Duftler committed Apr 25, 2017
1 parent 5a966d6 commit a4d99aa
Showing 1 changed file with 2 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ import com.netflix.spinnaker.clouddriver.security.DefaultAccountCredentialsProvi
import com.netflix.spinnaker.clouddriver.security.MapBackedAccountCredentialsRepository
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
import org.springframework.boot.context.properties.ConfigurationProperties
import org.springframework.context.ApplicationContext
import org.springframework.context.annotation.Bean
Expand Down Expand Up @@ -221,6 +222,7 @@ class CloudDriverConfig {
}

@Bean
@ConditionalOnProperty('redis.connection')
CoreProvider coreProvider(JedisSource jedisSource, ApplicationContext applicationContext) {
return new CoreProvider([
new CleanupPendingOnDemandCachesAgent(jedisSource, applicationContext)
Expand Down

0 comments on commit a4d99aa

Please sign in to comment.