Commit Graph

30 Commits

Author SHA1 Message Date
Spencer Gibb
86ff712398 Properly close child contexts in destroy()
fixes gh-91
2016-02-22 10:49:54 -07:00
Dave Syer
624be9d19e Fix ordering of property sources
When the bootstrap properties are added back into the main Environment
we have to be careful that any source that is already there (such as
one that was added in a Spring Boot EnvironmentPostProcessor) is not
replaced in the wrong order.

Fixes gh-90
2016-02-15 10:25:19 +00:00
tc
bcb4e60448 Fix property source for decrypted variables
Use SystemEnvironmentPropertySource so that env vars can be
encrypted as well as property values (i.e. FOO_BAR will bind to
@Value("foo.bar")).

Fixes gh-89, fixes gh-87
2016-02-11 14:46:26 +00:00
Spencer Gibb
8a21f71ad1 Reuse pause and resume endpoints to the can be disabled.
fixes gh-86
2016-02-03 12:38:28 -07:00
Dave Syer
9c6aeba780 Ensure spring.main.sources is not used in refresh cycle
When the RefreshEndpoint makes a new Environment it creates a new
ApplicationContext with (hopefully) empty sources. If the user has
set spring.main.sources it won't be empty, so we should take care
to mask it off in the process.

Fixes gh-79
2016-02-02 21:55:19 +00:00
Dave Syer
6f463ad10d Add RefreshScopeHealthIndicator
Repots DOWN if there are errors in RefreshScope or
ConfigurationProperties rebinding, N.B. RefreshScope instantiates
its beans lazily after a refresh by default, so you won't see an
error until the bean is used.

Fixes gh-85
2016-02-02 17:28:52 +00:00
Dave Syer
5cfe42b9af Fix careless mistake in tests 2016-02-01 13:26:21 +00:00
Dave Syer
fb37883a92 Ensure BootstrapApplicationListener adds property sources on refresh
The fact that PropertySourceBootstrapConfiguration was re-using the
"bootstrap" property source name from the listener was a problem. The
listener has to be able to manage its own temporary property source name.

Fixes gh-83
2016-01-30 10:20:49 +00:00
Dave Syer
12b9bfbe12 Extract file-based property sources during bootstrap
The bootstrap.properties need to stick with the default properties
during the process of initializing the application.properties
otherwise the ordering ends up wrong because of the addLast()
semantics in an Environment merge. To do this is a bit ugly with
the additional constraint that the default properties has to
remain a MapPropertySource (so that other processors can append
to it if needed). So we created a custom extension of
MapPropertySource that also carries all the bootstrap properties
during the phase where the application.properties are being
processed, but unpacks them as soon as possible afterwards
in an ApplicationContextInitializer, preserving the order, but
making the bootstrap.properties available effectively for the
whole of the startup and initializaion phase of the main context.
2016-01-23 10:37:20 +00:00
Dave Syer
b4c2c14d68 Further paring down of leaky proeprty sources in Bootstrap phase
The biggest problem addressed here is one where an
EnvironmentPostProcessor (reasonably) adds entries to the
defaultProperties in the bootstrap context, but then that
property source is not merged with the parent, or is merged
too late (because it only happens when the application context
parent is set). The result would be that things that were activated
during bootstrap would be not be activated in the main context, or
would be activated too late (early enough for beans to bind to but
not for other listeners and post processors to get access to the
additional properties).

See https://github.com/spring-cloud/spring-cloud-sleuth/issues/126
2016-01-22 14:26:54 +00:00
Dave Syer
532cb8efc7 Simplify logic with boot strap property sources a bit
We only need one special name for a property source. In the end it
gets used twice, but this simplifies the logic a bit and ensures that
there is never a PropertySource with that name and things like
spring.application.name=bootstrap in it.
2016-01-22 12:27:56 +00:00
Dave Syer
14d54b1964 Eagerly instantiate @RefreshScope beans on startup
This ensures that any fetaures that require a bean to be instantiated
(for instance @Scheduled) behave the same for @RefreshScope and normal
singletons.

Fixes gh-74
2015-12-31 15:30:30 +00:00
Dave Syer
aaa7288bae Synchronize access to the ObjectFactory in GenericScope
Otherwise multiple instances of a scoped target can be created
if several threads need one at the same time. This isn't always
going to be a problem, but it breaks the singleton semantics, and
might lead to surprising results and/or performance issues if bean
creation is expensive.
2015-12-21 15:45:31 +00:00
Dave Syer
79b11df61f Take care with order of property sources in /refresh endpoint
It's kind of a corner case, but not a very small corner: if a /refresh
leads to a change in a key that was overridden from its default value (e.g.
n a profile-specific config file) then the key is not identified as changed.
The change is still applied.

This commit fixes the key computation and adds a couple of tests.

Fixes gh-73
2015-12-21 14:32:33 +00:00
Dave Syer
5e29312518 Reverse order of property sources before decrypting
Fixes gh-70
2015-12-18 10:04:27 +00:00
Spencer Gibb
7d86198b17 Migrate SpringClientFactory and FeignClientFactory functions
fixes gh-69
2015-12-17 14:25:15 -07:00
Dave Syer
988189db82 Add extra decryption step before propery source locators
See also the integration tests in spring-cloud-samples/tests

Fixes gh-58
2015-11-11 09:13:56 +00:00
Dave Syer
a6124e7063 Add another property source for decrypted bootstrap properties
The problem is that we do want bootstrap properties to override
default properties in most cases, but if they are decrypted those
values have to be added with the highest possible precedence.

Fixes gh-54
2015-10-02 15:00:22 +01:00
Dave Syer
bf8c7cff71 Add test for refresh scope behaviour 2015-09-24 13:56:42 +01:00
Dave Syer
8c346506f4 Re-order events in RefreshEndpoint
EnvironmentChangeEvent should come before the RefreshScopeRefreshedEvent
so that all the @ConfigurationProperties are fully bound when the refresh
happens.
2015-09-24 12:14:46 +01:00
Dave Syer
dc06921877 Add test for message source configuration
See gh-29
2015-08-21 17:19:03 +01:00
Dave Syer
f022fb78bd Move RefreshEndpoint to more logical package 2015-08-21 14:40:52 +01:00
Dave Syer
b022a39ba8 Rebind configuration properties on startup in case environment changed
The main driver for this was a config server use case, where the server
wants to configure its own properties in the remote repo. It was working
up to a point, but the beans in bootstrap context were not refreshed
after the Environment was built so you had to manually refresh them to
get them to point to (e.g.) config repos configured remotely.

Fixes https://github.com/spring-cloud/spring-cloud-config/issues/139
2015-08-21 12:32:19 +01:00
Dave Syer
addeda8262 Allow ConfigurationPropertiesRebinder to rebind beans by name
including ones in the parent context.
2015-07-28 13:07:37 +01:00
Dave Syer
4df29bdfe7 Suppress rebinding of configuration properties for refresh scope
If a @ConfigurationProperties @Bean is in @RefreshScope then it doesn't
need to be rebound on an environment change event (it will re-initialize
on refresh).

See https://github.com/spring-cloud/spring-cloud-config/issues/183
2015-07-20 17:05:34 +01:00
Dave Syer
fbe17efd30 Internal change in RefreshEndpoint to keep property sources separate
The incoming (existing) environment needs to be used to initalize the
context that is created to grab the new environment, but we shouldn't
re-use the existing environment, rather just copy the property sources
and profiles.
2015-07-14 13:24:01 +01:00
Dave Syer
a58d06a704 Add test for refresh scope on configuration properties list 2015-07-14 13:24:01 +01:00
Dave Syer
2978b8df4d Clean up shutdown hooks on refresh
Fixes gh-63
2015-05-19 10:04:17 +01:00
Dave Syer
9d4584bb5c Add flag spring.cloud.config.overrideNone
If true (and spring.cloud.config.allowOverride=true) then the bootstrap
property source is added *last*, so all other property sources can override
it (including local config files).

Fixes gh-26, fixes gh-27.
2015-04-28 12:31:25 +01:00
Dave Syer
7d480ab41b Extract former config-client features to a new spring-cloud-context
Fixes gh-14
2015-03-19 11:52:25 +00:00